[mavibot] 02/07: 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 mavibot.

commit c249c702d8ce097865d5ad4692eef605c5df41a1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 21 09:39:54 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index dd1bd82..fbf6659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mavibot (1.0.0~M1-2) UNRELEASED; urgency=medium
 
   * Dropped the Maven 2 compatibility
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 21 Nov 2016 09:37:58 +0100
 
diff --git a/debian/control b/debian/control
index fea27e0..0338b0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,14 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                junit4,
                libcommons-collections3-java,
                libcommons-io-java,
                liblog4j1.2-java (>= 1.2.17),
                libslf4j-java,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/mavibot.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mavibot.git
diff --git a/debian/rules b/debian/rules
index 4a061cf..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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 $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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