The following commit has been merged in the master branch: commit 370f2e0e77cb5ec07b32339d905e70d4c24112b3 Author: James Page <james.p...@ubuntu.com> Date: Thu Apr 26 12:56:51 2012 +0100
d/rules, d/libjenkins-commons-jexl-java.poms: Use --usj-name instead of custom binary-post-install target to ensure jar file is named correctly. diff --git a/debian/changelog b/debian/changelog index f27d806..8b2a7d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ jenkins-commons-jexl (1.1-jenkins-20111212-1) unstable; urgency=low * d/libjenkins-commons-jexl-java.poms: Use --java-lib to ensure that jars are installed to /usr/share/java. * d/source/lintian-overrides: Dropped - no longer required. + * d/rules, d/libjenkins-commons-jexl-java.poms: Use --usj-name instead + of custom binary-post-install target to ensure jar file is named + correctly. - -- James Page <james.p...@ubuntu.com> Thu, 26 Apr 2012 12:42:03 +0100 + -- James Page <james.p...@ubuntu.com> Thu, 26 Apr 2012 12:52:16 +0100 jenkins-commons-jexl (1.1-hudson-20090508-1) unstable; urgency=low diff --git a/debian/libjenkins-commons-jexl-java.poms b/debian/libjenkins-commons-jexl-java.poms index e498ef4..746c655 100644 --- a/debian/libjenkins-commons-jexl-java.poms +++ b/debian/libjenkins-commons-jexl-java.poms @@ -23,4 +23,4 @@ # --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. # -pom.xml --has-package-version --java-lib +pom.xml --has-package-version --java-lib --usj-name=jenkins-commons-jexl diff --git a/debian/rules b/debian/rules index 007357a..7ae1c69 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,10 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_INSTALL_TO_USJ := false -PACKAGE := jenkins-commons-jexl -JAR := commons-jexl - -# Install branch specific named version in /usr/share/java -# This works around the fact that maven-debian-helper does -# not pass --usj-name from debian/*.poms -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java pom.xml -l \ - target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar --usj-name=$(PACKAGE) - jh_classpath -plib$(PACKAGE)-java get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- jenkins-commons-jexl packaging _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits