[SCM] jenkins-commons-jexl packaging branch, master, updated. upstream/1.1-hudson-20090508-5-g370f2e0
The following commit has been merged in the master branch: commit 8021a993e695f9bebfd6fe60ce3e1595ecb026dd Merge: 37b1ca81231838c50b2efa1735ce1d03b2d78e91 0fa3ed23ea51eb4e25f8073999630bc2e6fc3152 Author: James Page james.p...@ubuntu.com Date: Thu Apr 26 12:29:13 2012 +0100 Merge tag 'upstream/1.1-jenkins-20111212' Upstream version 1.1-jenkins-20111212 -- 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
[SCM] jenkins-commons-jexl packaging branch, master, updated. upstream/1.1-hudson-20090508-5-g370f2e0
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
[SCM] jenkins-commons-jexl packaging branch, master, updated. upstream/1.1-hudson-20090508-5-g370f2e0
The following commit has been merged in the master branch: commit aed83b90072fbbdecab813a1356375f4bfad92dc Author: James Page james.p...@ubuntu.com Date: Thu Apr 26 12:45:36 2012 +0100 New upstream release. * New upstream release. * Bumped Standards-Version to 3.9.3: - d/copyright: Refreshed for released version of DEP-5. * 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. diff --git a/debian/changelog b/debian/changelog index fe3080b..f27d806 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +jenkins-commons-jexl (1.1-jenkins-20111212-1) unstable; urgency=low + + * New upstream release. + * Bumped Standards-Version to 3.9.3: +- d/copyright: Refreshed for released version of DEP-5. + * 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. + + -- James Page james.p...@ubuntu.com Thu, 26 Apr 2012 12:42:03 +0100 + jenkins-commons-jexl (1.1-hudson-20090508-1) unstable; urgency=low * Initial Debian release (Closes: #634631) diff --git a/debian/control b/debian/control index 10e0e69..ba4688a 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends-Indep: libcommons-logging-java-doc, libjavacc-maven-plugin-java, libmaven-javadoc-plugin-java -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://github.com/jenkinsci/jexl/ Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-commons-jexl.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-commons-jexl.git diff --git a/debian/copyright b/debian/copyright index 41e4790..9770b0c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Hudson Commons JEXL +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Name: Jenkins Commons JEXL Source: https://github.com/jenkinsci/jexl/ Files: * diff --git a/debian/libjenkins-commons-jexl-java.poms b/debian/libjenkins-commons-jexl-java.poms index 9ec5af5..e498ef4 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 +pom.xml --has-package-version --java-lib diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 7ce1df6..d41ef96 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,3 +1,8 @@ +Description: Force target Java version to 1.5 otherwise the javacc + files generated won't compile +Author: James Page james.p...@ubuntu.com +Forwarded: not-needed + Index: hudson-jexl/pom.xml === --- hudson-jexl.orig/pom.xml 2011-06-29 11:02:11.456308337 +0100 diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index 272e78e..000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# version contains hu(ds)on so this is a false positive -jenkins-commons-jexl source: debian-watch-file-should-mangle-version line 3 -- 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
