[xmlstreambuffer] 06/13: 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 xmlstreambuffer.

commit 4691fdf98700a590c18ff6d700af4fe59b9a6e8c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 27 16:31:46 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog            | 1 +
 debian/control              | 5 ++---
 debian/maven.publishedRules | 1 -
 debian/rules                | 9 +++------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22226f0..dbeca51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xmlstreambuffer (1.5.3-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - New build dependency on libmaven-bundle-plugin-java
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index ece23c4..c1116b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                javahelper,
                libmaven-bundle-plugin-java,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.0)
 Build-Depends-Indep: glassfish-activation, libstax-ex-java, libstax-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/xmlstreambuffer.git
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/rules b/debian/rules
index 7ae1c69..d4bd8dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

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