[sisu-ioc] 02/03: 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-ioc.

commit 9e43306ff6d733aa1e54119b6dcef9ee5914e0b2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 10 13:33:58 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 3472d02..ca79257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sisu-ioc (2.3.0-7) UNRELEASED; urgency=medium
   * Team upload.
   * Fixed the source compatibility with plexus-utils 3.0.22
   * Fixed a build failure related to the bundle plugin (caused by bnd 2?)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 Nov 2015 10:33:21 +0100
 
diff --git a/debian/control b/debian/control
index 3cc6886..5b91605 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>
-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: junit4,
                      libaopalliance-java,
                      libatinject-jsr330-api-java,
diff --git a/debian/rules b/debian/rules
index ecce99e..9867785 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_BUILD_TARGET := install
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --no-symlink

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