This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant-contrib.
commit 34cc27388e0335635142cb9753e92bfd8558072d Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 3 00:10:54 2016 +0200 Build with the DH sequencer instead of CDBS --- debian/ant-contrib.poms | 2 +- debian/ant.properties | 4 +++- debian/changelog | 1 + debian/control | 2 +- debian/rules | 31 +++++++------------------------ 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/debian/ant-contrib.poms b/debian/ant-contrib.poms index df592fa..a302e54 100644 --- a/debian/ant-contrib.poms +++ b/debian/ant-contrib.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 --java-lib +pom.xml --java-lib --artifact=target/ant-contrib.jar diff --git a/debian/ant.properties b/debian/ant.properties index 5a465ca..3bcd8fd 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,6 +1,8 @@ +jar.name=ant-contrib.jar + ant.jar=/usr/share/java/ant.jar bcel.jar=/usr/share/java/bcel.jar -httpclient.jar=/usr/share/java/httpclient.jar +httpclient.jar=/usr/share/java/commons-httpclient.jar ivy.jar=/usr/share/java/ivy.jar junit.jar=/usr/share/java/junit.jar diff --git a/debian/changelog b/debian/changelog index 7e7d538..1c83e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ant-contrib (1.0~b3+svn177-8) UNRELEASED; urgency=medium + * Build with the DH sequencer instead of CDBS * Removed the unused portions of 0001-Debianize-build.xml.patch * Moved the package to Git * Standards-Version updated to 3.9.8 diff --git a/debian/control b/debian/control index c4eb987..d9343df 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: James Page <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk +Build-Depends: ant, debhelper (>= 9), default-jdk Build-Depends-Indep: ant-optional, ivy (>= 2), junit, diff --git a/debian/rules b/debian/rules index a3acda9..4bfa7a5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,12 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +export CLASSPATH=/usr/share/java/xercesImpl.jar -PACKAGE := ant-contrib -VERSION := 1.0b3 +%: + dh $@ --with maven-repo-helper -JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant -ANT_ARGS += -Djar.name=$(PACKAGE)-$(VERSION).jar -Dtstamp='$(shell dpkg-parsechangelog --show-field Date)' -DEB_ANT_BUILD_TARGET := jar -DEB_ANT_CHECK_TARGET := test -DEB_JARS := \ - ant-junit \ - ivy \ - commons-cli \ - commons-codec \ - commons-httpclient \ - commons-logging \ - oro \ - xercesImpl +override_dh_auto_build: + dh_auto_build -- jar -install/ant-contrib:: - mh_installpoms -pant-contrib - mh_installjar -pant-contrib -l pom.xml target/$(PACKAGE)-$(VERSION).jar usr/share/ant/lib/ant-contrib.jar - -clean:: - mh_clean +override_dh_auto_test: + dh_auto_build -- test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant-contrib.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
