[plexus-compiler] 01/01: Build with the DH sequencer instead of CDBS (Closes: #809285)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-compiler.

commit 10afbbebf442426ca847a01637db0134ac457c4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 29 18:25:44 2015 +0100

    Build with the DH sequencer instead of CDBS (Closes: #809285)
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 9 ++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 982ceb5..8e7ed41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plexus-compiler (2.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS (Closes: #809285)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Dec 2015 18:24:51 +0100
+
 plexus-compiler (2.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 6cda3b7..1063fbe 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>,
            Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: default-jdk-doc,
                      junit (>= 3.8.2),
                      libcommons-lang-java (>= 2.0),
diff --git a/debian/rules b/debian/rules
index ec3998e..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := install javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven
 
 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/plexus-compiler.git