This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-jexl2-java.
commit 847b7a225b2f475093224b9f820bbc09b8eb1543 Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 20 15:13:24 2016 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 1 - debian/libcommons-jexl2-java.poms | 2 +- debian/maven.cleanIgnoreRules | 1 - debian/maven.publishedRules | 2 -- debian/rules | 17 ++++++----------- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index be376a5..05fbd03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libcommons-jexl2-java (2.1.1-3) UNRELEASED; urgency=medium * Fixed the build failure with commons-parent 39 (enables the OSGI metadata) (Closes: #812085) + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Switch to debhelper level 9 * Standards-Version 3.9.6 (no changes) diff --git a/debian/control b/debian/control index eaacde3..a0222e6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: - cdbs, debhelper (>= 9), default-jdk, javahelper, diff --git a/debian/libcommons-jexl2-java.poms b/debian/libcommons-jexl2-java.poms index 0417132..40482d8 100644 --- a/debian/libcommons-jexl2-java.poms +++ b/debian/libcommons-jexl2-java.poms @@ -25,4 +25,4 @@ # --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --has-package-version +pom.xml --has-package-version --usj-name=commons-jexl2 diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules deleted file mode 100644 index 8b13789..0000000 --- a/debian/maven.cleanIgnoreRules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules deleted file mode 100644 index cec159e..0000000 --- a/debian/maven.publishedRules +++ /dev/null @@ -1,2 +0,0 @@ - -org.apache.commons commons-jexl jar s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 81ee26a..2409317 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,12 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +export JAVA_HOME = /usr/lib/jvm/default-java -JAVA_HOME := /usr/lib/jvm/default-java -DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt +%: + dh $@ --buildsystem=maven --with javahelper -binary-post-install/libcommons-jexl2-java:: - mh_installpoms -plibcommons-jexl2-java - mh_installjar -plibcommons-jexl2-java -l pom.xml -ncommons-jexl2 target/commons-jexl-$(DEB_UPSTREAM_VERSION).jar - rm debian/libcommons-jexl2-java/usr/share/java/commons-jexl.jar - rm debian/libcommons-jexl2-java/usr/share/java/commons-jexl-$(DEB_UPSTREAM_VERSION).jar - jh_classpath -plibcommons-jexl2-java +override_dh_installchangelogs: + dh_installchangelogs -- RELEASE-NOTES.txt get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-jexl2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
