This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-ant-helper.
commit e7684e15c9e6a0cd1e8542133ecd4061ecbd9cca Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 17:15:15 2017 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b260bd..79dbfa0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ maven-ant-helper (7.12) UNRELEASED; urgency=medium * Depend on libmaven3-core-java instead of libmaven2-core-java + * Build with the DH sequencer instead of CDBS * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 7f799b0..2fe453d 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 10), default-jdk +Build-Depends: debhelper (>= 10), default-jdk Build-Depends-Indep: ant, ant-contrib, ant-optional Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-ant-helper.git diff --git a/debian/rules b/debian/rules index 9f462bf..03b704d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/dpkg/pkg-info.mk -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ') -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xalan2 -DEB_ANT_BUILD_TARGET := package -DEB_ANT_BUILDFILE := ./debian/build.xml -DEB_ANT_ARGS := -DartifactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -propertyfile debian/build.properties +%: + dh $@ --buildsystem=ant -binary-post-install/$(PACKAGE):: - dh_install build/$(PACKAGE)-$(VERSION).jar usr/share/java - dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar +override_dh_auto_build: + dh_auto_build -- -f debian/build.xml -DartifactId=$(DEB_SOURCE) -Dpackage=$(DEB_SOURCE) -Dversion=$(DEB_VERSION) -propertyfile debian/build.properties package + +override_dh_auto_clean: + dh_auto_clean -- -f debian/build.xml -propertyfile debian/build.properties + +override_dh_auto_install: + dh_install build/$(DEB_SOURCE)-$(DEB_VERSION).jar usr/share/java + dh_link usr/share/java/$(DEB_SOURCE)-$(DEB_VERSION).jar usr/share/java/$(DEB_SOURCE).jar dh_installdirs -A usr/share/maven-ant-helper dh_install maven-build.xml usr/share/maven-ant-helper dh_install maven-defaults.properties usr/share/maven-ant-helper -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-ant-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
