[libxml-commons-resolver1.1-java] 34/35: 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 libxml-commons-resolver1.1-java.

commit 6005c86d12ccbfb66594df09942a2712fd5f2149
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 19 10:14:17 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  1 -
 debian/rules     | 17 ++++++-----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f4a0c9..1163507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxml-commons-resolver1.1-java (1.2-8) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the GCJ package
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Removed Michael Koch from the uploaders (Closes: #654104)
   * Standards-Version updated to 3.9.8
diff --git a/debian/control b/debian/control
index 29fe04b..e4e0f25 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends:
  ant,
- cdbs (>= 0.4.8),
  debhelper (>= 10),
  default-jdk,
  javahelper,
diff --git a/debian/rules b/debian/rules
index e69dc56..7710572 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules file for libxml-commons-resolver1.1-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_build:
+	dh_auto_build -- -f resolver.xml jar
 
-DEB_JARS := xerces jaxp-1.3
-DEB_ANT_BUILDFILE := resolver.xml
-DEB_ANT_BUILD_TARGET := jar
-
-install/libxml-commons-resolver1.1-java:: build
-	mh_install
+override_dh_auto_clean:
+	dh_auto_build -- -f resolver.xml clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-commons-resolver1.1-java.git