[jersey1] 03/06: 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 jersey1.

commit 01981efcb76eab756a79754ba3ff57257cf89a1c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 2 09:19:59 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 198128b..46d32fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 jersey1 (1.19-3) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index eb7e18f..89fd072 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                glassfish-javaee,
                libbuild-helper-maven-plugin-java,
diff --git a/debian/rules b/debian/rules
index 49ca5e1..61d7abb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,19 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
 JAVA_HOME := /usr/lib/jvm/default-java
 
-post-patches::
+%:
+	dh $@ --buildsystem=maven
+
+override_dh_auto_build:
 	# Generate the classes manually since the maven-jaxb-plugin isn't in Debian
 	$(JAVA_HOME)/bin/xjc -p com.sun.research.ws.wadl -d jersey-server/src/main/java -catalog jersey-server/etc/catalog.xml jersey-server/etc
 
-clean::
+	dh_auto_build
+
+override_dh_clean:
+	dh_clean
+
 	# Remove the generated WADL classes
 	rm -Rf jersey-server/src/main/java/com/sun/research
 

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