The following commit has been merged in the master branch: commit 9822dcf68fa5d465b07a473f0d8456970546025e Author: Damien Raude-Morvan <draz...@debian.org> Date: Tue Jan 17 23:46:20 2012 +0100
Refresh all patches. diff --git a/debian/changelog b/debian/changelog index 55e2ac9..eae1da3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ uimaj (2.4.0-1) unstable; urgency=low * New upstream release. + * Refresh all patches. - -- Damien Raude-Morvan <draz...@debian.org> Tue, 17 Jan 2012 23:39:28 +0100 + -- Damien Raude-Morvan <draz...@debian.org> Tue, 17 Jan 2012 23:46:14 +0100 uimaj (2.3.1-2) unstable; urgency=low diff --git a/debian/patches/build-helper-version.diff b/debian/patches/build-helper-version.diff index 593e31c..327ece8 100644 --- a/debian/patches/build-helper-version.diff +++ b/debian/patches/build-helper-version.diff @@ -1,6 +1,6 @@ --- a/uimaj-core/pom.xml +++ b/uimaj-core/pom.xml -@@ -131,6 +131,12 @@ +@@ -156,6 +156,12 @@ <version>1.5</version> <executions> <execution> @@ -13,10 +13,3 @@ <id>addVersionSrc</id> <goals><goal>add-source</goal></goals> <configuration> -@@ -171,4 +177,4 @@ - </plugin> - </plugins> - </build> --</project> -\ No newline at end of file -+</project> diff --git a/debian/patches/disable_ecore.diff b/debian/patches/disable_ecore.diff index 333c7f6..7f9f589 100644 --- a/debian/patches/disable_ecore.diff +++ b/debian/patches/disable_ecore.diff @@ -23,24 +23,23 @@ Forwared: not-needed </dependencies> <build> <finalName>uima-examples</finalName> -@@ -124,7 +126,17 @@ - </execution> - </executions> - </plugin> -- -+<plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <configuration> -+ <source>1.5</source> -+ <target>1.5</target> -+ <excludes> -+ <exclude>**/org/apache/uima/examples/xmi/**.java</exclude> -+ </excludes> -+ </configuration> -+</plugin> - </plugins> +@@ -124,7 +126,18 @@ + </configuration> + </execution> + </executions> +- </plugin> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <source>1.5</source> ++ <target>1.5</target> ++ <excludes> ++ <exclude>**/org/apache/uima/examples/xmi/**.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> + </plugins> + </pluginManagement> </build> --</project> -\ No newline at end of file -+</project> diff --git a/debian/patches/disable_internal_javadoc.diff b/debian/patches/disable_internal_javadoc.diff index 5be8e33..ce9ff62 100644 --- a/debian/patches/disable_internal_javadoc.diff +++ b/debian/patches/disable_internal_javadoc.diff @@ -1,6 +1,6 @@ ---- a/uimaj-distr/pom.xml -+++ b/uimaj-distr/pom.xml -@@ -178,8 +178,8 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -169,8 +169,8 @@ <executions> <execution> <id>javadocs-distr</id> <!-- name should match one in parent-pom --> diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff index 745a24a..adce1b2 100644 --- a/debian/patches/modules.diff +++ b/debian/patches/modules.diff @@ -4,23 +4,6 @@ Description: Disable some modules: Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2010-03-21 Forwarded: not-needed ---- a/aggregate-uimaj/pom.xml -+++ b/aggregate-uimaj/pom.xml -@@ -68,7 +68,6 @@ - <module>../uimaj-test-util</module> - <module>../uimaj-component-test-util</module> - <module>../jVinci</module> -- <module>../aggregate-uimaj-eclipse-plugins</module> - <module>../aggregate-uimaj-docbooks</module> - <!--module>distr-superPom</module--> - <module>../uimaj-document-annotation</module> -@@ -79,4 +78,4 @@ - <!--module>../uimaj-internal-tools</module--> - <module>../uimaj-bootstrap</module> - </modules> --</project> -\ No newline at end of file -+</project> --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -60,6 +60,7 @@ @@ -31,35 +14,27 @@ Forwarded: not-needed <module>../uimaj-ep-debug</module> <module>../uimaj-ep-jcasgen</module> <module>../uimaj-ep-configurator</module> -@@ -69,5 +70,6 @@ +@@ -71,5 +72,6 @@ <module>../uimaj-eclipse-feature-tools</module> <module>../uimaj-eclipse-feature-runtime</module> +--> </modules> </project> ---- a/uimaj-distr/pom.xml -+++ b/uimaj-distr/pom.xml -@@ -103,6 +103,7 @@ - <artifactId>uimaj-tools</artifactId> - <version>${project.version}</version> - </dependency> -+<!-- - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-ep-cas-editor</artifactId> -@@ -133,6 +134,7 @@ - <artifactId>uimaj-ep-runtime</artifactId> - <version>${project.version}</version> - </dependency> -+--> - </dependencies> - - <build> -@@ -247,4 +249,4 @@ - </profile> - </profiles> - +--- a/aggregate-uimaj/pom.xml ++++ b/aggregate-uimaj/pom.xml +@@ -68,7 +68,6 @@ + <module>../uimaj-test-util</module> + <module>../uimaj-component-test-util</module> + <module>../jVinci</module> +- <module>../aggregate-uimaj-eclipse-plugins</module> + <module>../aggregate-uimaj-docbooks</module> + <!--module>distr-superPom</module--> + <module>../uimaj-document-annotation</module> +@@ -79,4 +78,4 @@ + <!--module>../uimaj-internal-tools</module--> + <module>../uimaj-bootstrap</module> + </modules> -</project> \ No newline at end of file +</project> diff --git a/debian/patches/script.diff b/debian/patches/script.diff index b4c9709..d97de00 100644 --- a/debian/patches/script.diff +++ b/debian/patches/script.diff @@ -3,8 +3,8 @@ Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2010-03-21 Forwarded: not-needed ---- a/uimaj-distr/src/main/scripts/adjustExamplePaths.sh -+++ b/uimaj-distr/src/main/scripts/adjustExamplePaths.sh +--- a/src/main/scripts/adjustExamplePaths.sh ++++ b/src/main/scripts/adjustExamplePaths.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -15,8 +15,8 @@ Forwarded: not-needed fi if [ "$JAVA_HOME" = "" ] ---- a/uimaj-distr/src/main/scripts/annotationViewer.sh -+++ b/uimaj-distr/src/main/scripts/annotationViewer.sh +--- a/src/main/scripts/annotationViewer.sh ++++ b/src/main/scripts/annotationViewer.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -27,8 +27,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.AnnotationViewerMain ---- a/uimaj-distr/src/main/scripts/cpeGui.sh -+++ b/uimaj-distr/src/main/scripts/cpeGui.sh +--- a/src/main/scripts/cpeGui.sh ++++ b/src/main/scripts/cpeGui.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -39,8 +39,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cpm.CpmFrame ---- a/uimaj-distr/src/main/scripts/cvd.sh -+++ b/uimaj-distr/src/main/scripts/cvd.sh +--- a/src/main/scripts/cvd.sh ++++ b/src/main/scripts/cvd.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -51,8 +51,8 @@ Forwarded: not-needed fi UIMA_CVDMAN="-Duima.tools.cvd.manpath=$UIMA_HOME/docs/d" ---- a/uimaj-distr/src/main/scripts/deploytool.sh -+++ b/uimaj-distr/src/main/scripts/deploytool.sh +--- a/src/main/scripts/deploytool.sh ++++ b/src/main/scripts/deploytool.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -63,8 +63,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.axis.client.AdminClient -lhttp://localhost:8080/axis/services/AdminService $1 ---- a/uimaj-distr/src/main/scripts/documentAnalyzer.sh -+++ b/uimaj-distr/src/main/scripts/documentAnalyzer.sh +--- a/src/main/scripts/documentAnalyzer.sh ++++ b/src/main/scripts/documentAnalyzer.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -75,8 +75,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.docanalyzer.DocumentAnalyzer ---- a/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh -+++ b/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh +--- a/src/main/scripts/ibmUimaToApacheUima.sh ++++ b/src/main/scripts/ibmUimaToApacheUima.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -87,8 +87,8 @@ Forwarded: not-needed fi if [ "$JAVA_HOME" = "" ] ---- a/uimaj-distr/src/main/scripts/jcasgen.sh -+++ b/uimaj-distr/src/main/scripts/jcasgen.sh +--- a/src/main/scripts/jcasgen.sh ++++ b/src/main/scripts/jcasgen.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -106,8 +106,8 @@ Forwarded: not-needed -fi \ No newline at end of file +fi ---- a/uimaj-distr/src/main/scripts/jcasgen_merge.sh -+++ b/uimaj-distr/src/main/scripts/jcasgen_merge.sh +--- a/src/main/scripts/jcasgen_merge.sh ++++ b/src/main/scripts/jcasgen_merge.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -118,8 +118,8 @@ Forwarded: not-needed fi ---- a/uimaj-distr/src/main/scripts/runAE.sh -+++ b/uimaj-distr/src/main/scripts/runAE.sh +--- a/src/main/scripts/runAE.sh ++++ b/src/main/scripts/runAE.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -130,8 +130,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.RunAE $@ ---- a/uimaj-distr/src/main/scripts/runCPE.sh -+++ b/uimaj-distr/src/main/scripts/runCPE.sh +--- a/src/main/scripts/runCPE.sh ++++ b/src/main/scripts/runCPE.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -142,8 +142,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.cpe.SimpleRunCPE $@ ---- a/uimaj-distr/src/main/scripts/runPearInstaller.sh -+++ b/uimaj-distr/src/main/scripts/runPearInstaller.sh +--- a/src/main/scripts/runPearInstaller.sh ++++ b/src/main/scripts/runPearInstaller.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -154,8 +154,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.install.InstallPear ---- a/uimaj-distr/src/main/scripts/runPearMerger.sh -+++ b/uimaj-distr/src/main/scripts/runPearMerger.sh +--- a/src/main/scripts/runPearMerger.sh ++++ b/src/main/scripts/runPearMerger.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -166,8 +166,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.merger.PMController $@ ---- a/uimaj-distr/src/main/scripts/runPearPackager.sh -+++ b/uimaj-distr/src/main/scripts/runPearPackager.sh +--- a/src/main/scripts/runPearPackager.sh ++++ b/src/main/scripts/runPearPackager.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -178,8 +178,8 @@ Forwarded: not-needed fi "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.packager.PearPackager $@ ---- a/uimaj-distr/src/main/scripts/runUimaClass.sh -+++ b/uimaj-distr/src/main/scripts/runUimaClass.sh +--- a/src/main/scripts/runUimaClass.sh ++++ b/src/main/scripts/runUimaClass.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -199,8 +199,8 @@ Forwarded: not-needed UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/examples/resources UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib if [ -e "$ACTIVEMQ_HOME" ] ---- a/uimaj-distr/src/main/scripts/setUimaClassPath.sh -+++ b/uimaj-distr/src/main/scripts/setUimaClassPath.sh +--- a/src/main/scripts/setUimaClassPath.sh ++++ b/src/main/scripts/setUimaClassPath.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -211,8 +211,8 @@ Forwarded: not-needed fi LOCAL_SAVED_UIMA_CLASSPATH=$UIMA_CLASSPATH UIMA_CLASSPATH=$UIMA_HOME/examples/resources ---- a/uimaj-distr/src/main/scripts/startVNS.sh -+++ b/uimaj-distr/src/main/scripts/startVNS.sh +--- a/src/main/scripts/startVNS.sh ++++ b/src/main/scripts/startVNS.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -223,8 +223,8 @@ Forwarded: not-needed fi if [ "$JAVA_HOME" = "" ] ---- a/uimaj-distr/src/main/scripts/startVinciService.sh -+++ b/uimaj-distr/src/main/scripts/startVinciService.sh +--- a/src/main/scripts/startVinciService.sh ++++ b/src/main/scripts/startVinciService.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] @@ -235,8 +235,8 @@ Forwarded: not-needed fi if [ "$1" = "" ]; ---- a/uimaj-distr/src/main/scripts/validateDescriptor.sh -+++ b/uimaj-distr/src/main/scripts/validateDescriptor.sh +--- a/src/main/scripts/validateDescriptor.sh ++++ b/src/main/scripts/validateDescriptor.sh @@ -19,8 +19,7 @@ if [ "$UIMA_HOME" = "" ] -- Debian packaging for uimaj _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits