[libxpp2-java] 16/20: 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 libxpp2-java.

commit 2e2ee2edd2be7c213c9a601e51c3aaf1c8c2a67e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 14 21:57:14 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog         |  1 +
 debian/control           |  2 +-
 debian/libxpp2-java.dirs |  1 -
 debian/rules             | 17 +++++++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffa42fe..71a9769 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxpp2-java (2.1.10-8) UNRELEASED; urgency=medium
 
   * Team upload.
   * No longer install the javadoc in the library package
+  * 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 4d4cf1b..674f42c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 10), cdbs (>= 0.4.28), ant, default-jdk
+Build-Depends: debhelper (>= 10), ant, default-jdk
 Build-Depends-Indep: junit
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxpp2-java.git
diff --git a/debian/libxpp2-java.dirs b/debian/libxpp2-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libxpp2-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/rules b/debian/rules
index eaf50f6..d244088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/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
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@
 
-DEB_JARS := ant-junit junit
-DEB_ANT_BUILD_TARGET := compile junit
+override_dh_auto_build:
+	dh_auto_build -- compile junit
 
-install/libxpp2-java::
-	install -m 644 build/lib/PullParser-$(DEB_UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2-$(DEB_UPSTREAM_VERSION).jar
-	ln -s xpp2-$(DEB_UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2.jar
+override_dh_install:
+	dh_install
+	install -m 644 build/lib/PullParser-$(DEB_VERSION_UPSTREAM).jar debian/libxpp2-java/usr/share/java/xpp2-$(DEB_VERSION_UPSTREAM).jar
+	ln -s xpp2-$(DEB_VERSION_UPSTREAM).jar debian/libxpp2-java/usr/share/java/xpp2.jar

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