[SCM] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 7cc9f92b939b88b7b2bd167355d25258f31a79c5
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Wed Jan 18 00:13:15 2012 +0100

    d/libuima-core-java.poms: Use this file to install JARs instead of d/rules.

diff --git a/debian/changelog b/debian/changelog
index 2abdcde..5c7b1e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ uimaj (2.4.0-1) unstable; urgency=low
   * Refresh all patches.
   * d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball.
   * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc.
+  * d/libuima-core-java.poms: Use this file to install JARs instead of d/rules.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 17 Jan 2012 23:54:35 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 18 Jan 2012 00:13:03 +0100
 
 uimaj (2.3.1-2) unstable; urgency=low
 
diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms
index 01512cc..205e0dc 100644
--- a/debian/libuima-core-java.poms
+++ b/debian/libuima-core-java.poms
@@ -23,31 +23,31 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
 #     temporarily for certain artifacts such as Javadoc jars.
 
-uimaj-parent/pom.xml --no-parent
-pom.xml
+uimaj-parent/pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
 
-aggregate-uimaj/pom.xml
-aggregate-uimaj-docbooks/pom.xml
+aggregate-uimaj/pom.xml --has-package-version
+aggregate-uimaj-docbooks/pom.xml --has-package-version
 
-uimaj-core/pom.xml
-uimaj-test-util/pom.xml
-uimaj-component-test-util/pom.xml
+uimaj-core/pom.xml --has-package-version --java-lib --artifact=uimaj-core/target/uima-core.jar
+uimaj-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-test-util/target/uimaj-test-util-*.jar
+uimaj-component-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-component-test-util/target/uimaj-component-test-util-*.jar
 
-uimaj-adapter-soap/pom.xml --package libuima-adapter-soap-java
+uimaj-adapter-soap/pom.xml --has-package-version --package libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar
 
-uimaj-adapter-vinci/pom.xml --package libuima-adapter-vinci-java
+uimaj-adapter-vinci/pom.xml --has-package-version --package libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar
 
-uimaj-cpe/pom.xml --package libuima-cpe-java
+uimaj-cpe/pom.xml --has-package-version --package libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar
 
-uimaj-document-annotation/pom.xml --package libuima-document-annotation-java
+uimaj-document-annotation/pom.xml --has-package-version --package libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar
 
-uimaj-tools/pom.xml --package libuima-tools-java
-uimaj-bootstrap/pom.xml --package libuima-tools-java
-PearPackagingMavenPlugin/pom.xml --package libuima-tools-java
+uimaj-tools/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar
+uimaj-bootstrap/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
+PearPackagingMavenPlugin/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
 
-jVinci/pom.xml --package libuima-vinci-java
+jVinci/pom.xml --has-package-version --package libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar
 
-uimaj-examples/pom.xml --package uima-examples
+uimaj-examples/pom.xml --has-package-version --package uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar
 
 uima-docbook-overview-and-setup/pom.xml --ignore-pom
 uima-docbook-references/pom.xml --ignore-pom
diff --git a/debian/rules b/debian/rules
index 93080b5..51c1bad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,6 @@ JAVA_OPTS            += -Xmx512m
 # Use new javadoc:aggregate target to generate Javadoc
 DEB_MAVEN_BUILD_TARGET   := install
 DEB_MAVEN_DOC_TARGET     := javadoc:aggregate
-# Disable auto-install because we use multiple packages
-DEB_MAVEN_INSTALL_TARGET :=
 
 # Manpages generation
 DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
@@ -33,48 +31,6 @@ clean::
 	mh_clean
 	-rm $(UIMA_MANPAGES)
 
-binary-install/libuima-vinci-java::
-	mh_installpom -plibuima-vinci-java -e$(VERSION) jVinci/pom.xml
-	mh_installjar -plibuima-vinci-java -e$(VERSION) -l jVinci/pom.xml jVinci/target/jVinci.jar
-
-binary-install/libuima-adapter-soap-java::
-	mh_installpom -plibuima-adapter-soap-java -e$(VERSION) uimaj-adapter-soap/pom.xml
-	mh_installjar -plibuima-adapter-soap-java -e$(VERSION) -l uimaj-adapter-soap/pom.xml uimaj-adapter-soap/target/uima-adapter-soap.jar
-
-binary-install/libuima-adapter-vinci-java::
-	mh_installpom -plibuima-adapter-vinci-java -e$(VERSION) uimaj-adapter-vinci/pom.xml
-	mh_installjar -plibuima-adapter-vinci-java -e$(VERSION) -l uimaj-adapter-vinci/pom.xml uimaj-adapter-vinci/target/uima-adapter-vinci.jar
-
-binary-install/libuima-core-java::
-	mh_installpom -plibuima-core-java -e$(VERSION) uimaj-parent/pom.xml
-	mh_installpom -plibuima-core-java -e$(VERSION) uimaj/pom.xml
-	mh_installpom -plibuima-core-java -e$(VERSION) uimaj-core/pom.xml
-	mh_installpom -plibuima-core-java -e$(VERSION) uimaj-test-util/pom.xml
-	mh_installpom -plibuima-core-java -e$(VERSION) uimaj-component-test-util/pom.xml
-	mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-core/pom.xml uimaj-core/target/uima-core.jar
-	mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-test-util/pom.xml uimaj-test-util/target/uimaj-test-util-$(VERSION).jar
-	mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-component-test-util/pom.xml uimaj-component-test-util/target/uimaj-component-test-util-$(VERSION).jar
-
-binary-install/libuima-cpe-java::
-	mh_installpom -plibuima-cpe-java -e$(VERSION) uimaj-cpe/pom.xml
-	mh_installjar -plibuima-cpe-java -e$(VERSION) -l uimaj-cpe/pom.xml uimaj-cpe/target/uima-cpe.jar
-
-binary-install/libuima-document-annotation-java::
-	mh_installpom -plibuima-document-annotation-java -e$(VERSION) uimaj-document-annotation/pom.xml
-	mh_installjar -plibuima-document-annotation-java -e$(VERSION) -l uimaj-document-annotation/pom.xml uimaj-document-annotation/target/uima-document-annotation.jar
-
-binary-install/libuima-tools-java::
-	mh_installpom -plibuima-tools-java -e$(VERSION) uimaj-tools/pom.xml
-	mh_installpom -plibuima-tools-java -e$(VERSION) uimaj-bootstrap/pom.xml
-	mh_installpom -plibuima-tools-java -e$(VERSION) PearPackagingMavenPlugin/pom.xml
-	mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-tools/pom.xml uimaj-tools/target/uima-tools.jar
-	mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-bootstrap/pom.xml uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
-	mh_installjar -plibuima-tools-java -e$(VERSION) -l PearPackagingMavenPlugin/pom.xml PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
-
-binary-install/uima-examples::
-	mh_installpom -puima-examples -e$(VERSION) uimaj-examples/pom.xml
-	mh_installjar -puima-examples -e$(VERSION) -l uimaj-examples/pom.xml uimaj-examples/target/uima-examples.jar
-
 binary-install/uima-utils::
 	# Remove suffixes on binaries
 	mv debian/uima-utils/usr/bin/annotationViewer.sh debian/uima-utils/usr/bin/annotationViewer

-- 
Debian packaging for uimaj