[avalon-framework] 22/23: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository avalon-framework.

commit 1e8dde0a396e1139362213ca025a8157a6db57e0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 30 22:45:18 2017 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                     |  1 +
 debian/control                       |  1 -
 debian/dirs                          |  1 -
 debian/libavalon-framework-java.poms |  3 +++
 debian/rules                         | 32 +++++++++-----------------------
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d81160a..e3c1f20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ avalon-framework (4.2.0-10) UNRELEASED; urgency=medium
   * Team upload.
   * Fixed the build failure with Java 9 (Closes: #872797)
   * Removed Niels Thykier from the uploaders (Closes: #770574)
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index a4245e3..0f64138 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant-optional,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  junit,
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libavalon-framework-java.poms b/debian/libavalon-framework-java.poms
new file mode 100644
index 0000000..8826b84
--- /dev/null
+++ b/debian/libavalon-framework-java.poms
@@ -0,0 +1,3 @@
+debian/poms/pom.xml      --no-parent --has-package-version --java-lib --usj-name=avalon-framework --usj-version=4.2.0 --artifact=dist/avalon-framework.jar
+debian/poms/pom_api.xml  --no-parent --has-package-version --java-lib --usj-name=avalon-framework --usj-version=4.2.0 --artifact=dist/avalon-framework.jar
+debian/poms/pom_impl.xml --no-parent --has-package-version --java-lib --usj-name=avalon-framework --usj-version=4.2.0 --artifact=dist/avalon-framework.jar
diff --git a/debian/rules b/debian/rules
index 4812cf5..af7abaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,15 @@
 #!/usr/bin/make -f
-# debian/rules for avalon-framework
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/excalibur-logkit.jar
 
-VERSION	    := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME  := /usr/share/ant
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml jar doc
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar excalibur-logkit log4j-1.2 xalan2 $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar doc
-DEB_ANT_CHECK_TARGET := test-all
+override_dh_auto_test:
+	dh_auto_build -- -f debian/build.xml test-all
 
-POMS := debian/poms/pom.xml debian/poms/pom_api.xml debian/poms/pom_impl.xml
-
-install/libavalon-framework-java::
-	# Install poms and jar
-	for pom in $(POMS); do \
-		mh_installpom -v -o -plibavalon-framework-java $$pom; \
-		mh_installjar -plibavalon-framework-java -l $$pom \
-			-navalon-framework -i${VERSION} dist/avalon-framework.jar; \
-	done
-
-install/libavalon-framework-java-doc::
-	# remove the zero byte file to fix lintian warning
-	rm -f doc/api/package-list
+override_dh_auto_clean:
+	dh_auto_clean -- -f debian/build.xml clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/avalon-framework.git