[sisu-guice] 04/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 sisu-guice.

commit 7e14685965e3a47a9db6660b5d3c7d3e1f3913d0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 11 09:58:49 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index c0c83d0..90909e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sisu-guice (3.2.6-2) UNRELEASED; urgency=medium
   * Team upload.
   * Fixed the build failure with Java 8 (Closes: #814406)
   * Standards-Version updated to 3.9.7 (no changes)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Feb 2016 09:53:19 +0100
 
diff --git a/debian/control b/debian/control
index bd2971c..bc52dd6 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: Damien Raude-Morvan <drazzib at debian.org>, Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: glassfish-javaee,
                      libaopalliance-java,
                      libasm4-java,
diff --git a/debian/rules b/debian/rules
index 9199a6f..7807a40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,14 @@
 #!/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
-
 # Variables for the Built-Using field in the control file
 ASM_VERSION   := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java)
 CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib3-java)
-DEB_DH_GENCONTROL_ARGS_ALL := -- -Vasm:Version=${ASM_VERSION} -Vcglib:Version=${CGLIB_VERSION}
+
+%:
+	dh $@ --buildsystem=maven
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vasm:Version=${ASM_VERSION} -Vcglib:Version=${CGLIB_VERSION}
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename --verbose

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