[build-helper-maven-plugin] 04/21: 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 build-helper-maven-plugin.

commit ea71ffec82bf81a9f52d0620ab08762fa81203e5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 00:43:20 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 6277ea8..8bd3e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 build-helper-maven-plugin (1.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 06aa177..02edbbc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
            Matthias Schmitz <matthias at sigxcpu.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
 Build-Depends-Indep: default-jdk-doc,
                      libmaven-invoker-plugin-java,
                      libmaven-javadoc-plugin-java,
diff --git a/debian/rules b/debian/rules
index 7fd6715..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/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
+%:
+	dh $@
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-clean::
-	mh_clean
-	-rm mvn-build
-	-rm -r debian/null
\ No newline at end of file
+	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/build-helper-maven-plugin.git