[guice] 07/12: Use mh_install once instead of mh_installpoms and mh_installjar for each extension

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guice.

commit 6760fe9de9ee01bf60c75a5db9d33b558061c67d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 15:11:41 2014 +0200

    Use mh_install once instead of mh_installpoms and mh_installjar for each extension
---
 debian/changelog          |  1 +
 debian/libguice-java.poms | 38 +++++++++++++++++++++++++++++++++-----
 debian/rules              | 21 +--------------------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14d5aa6..f5ba474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ guice (3.0-6) UNRELEASED; urgency=medium
   * Build and install the servlet and multibindings extensions
   * Fixed a build failure caused by the cglib/asm transition
   * Use links to the system jars instead of patching the build script
+  * debian/rules: Use mh_install once instead of mh_installpoms/mh_installjar
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 09 Oct 2014 11:40:23 +0200
diff --git a/debian/libguice-java.poms b/debian/libguice-java.poms
index 2831c20..0fdbb16 100644
--- a/debian/libguice-java.poms
+++ b/debian/libguice-java.poms
@@ -1,5 +1,33 @@
-core/pom.xml --no-parent
-extensions/pom.xml
-extensions/assistedinject/pom.xml
-extensions/servlet/pom.xml
-extensions/multibindings/pom.xml
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+
+core/pom.xml          --no-parent --has-package-version --java-lib --artifact=build/dist/guice-3.0.jar
+extensions/pom.xml                --has-package-version
+extensions/assistedinject/pom.xml --has-package-version --java-lib --artifact=extensions/assistedinject/build/guice-assistedinject-3.0.jar
+extensions/servlet/pom.xml        --has-package-version --java-lib --artifact=extensions/servlet/build/guice-servlet-3.0.jar
+extensions/multibindings/pom.xml  --has-package-version --java-lib --artifact=extensions/multibindings/build/guice-multibindings-3.0.jar
diff --git a/debian/rules b/debian/rules
index 7163bb7..2a7234c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,26 +27,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
-
-	# install main jar
-	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
-		core/pom.xml build/dist/guice-$(VERSION).jar
-	mh_installpoms -plibguice-java --set-version=$(VERSION)
-
-	# install assistedinject extension
-	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
-		extensions/assistedinject/pom.xml \
-		extensions/assistedinject/build/guice-assistedinject-$(VERSION).jar
-
-	# install servlet extension
-	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
-		extensions/servlet/pom.xml \
-		extensions/servlet/build/guice-servlet-$(VERSION).jar
-
-	# install servlet extension
-	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
-		extensions/multibindings/pom.xml \
-		extensions/multibindings/build/guice-multibindings-$(VERSION).jar
+	mh_install -plibguice-java -v --set-version=$(VERSION)
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git