[dumbster] 13/18: 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 dumbster.

commit 33c417bc580e029ce24e37ddc4c26fb22ce13fd8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 23 17:24:07 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/docs      |  2 --
 debian/rules     | 28 ++++++++--------------------
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fdae7a..d24d0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dumbster (1.6+debian-3) UNRELEASED; urgency=medium
   * Depend on libmail-java instead of libgnumail-java
   * Enabled the debugging symbols
   * No longer install the javadoc and the test results in the binary package
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Fixed the watch file
diff --git a/debian/control b/debian/control
index 939f020..15e9f70 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Denker <Stefan+Debian at dn-kr.de>
-Build-Depends: cdbs, debhelper (>= 10)
+Build-Depends: debhelper (>= 10)
 Build-Depends-Indep: 
    default-jdk
  , libmail-java
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index dd47205..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-notice.txt
-version.txt
diff --git a/debian/rules b/debian/rules
index 3d6a830..db28421 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --with maven-repo-helper
 
-# Add here any variable or target overrides you need.
+override_dh_auto_build:
+	dh_auto_build -- compile jar
 
-# Set either a single (JAVA_HOME) or multiple (JAVA_HOME_DIRS) java locations
-JAVA_HOME = /usr/lib/jvm/default-java/
+override_dh_auto_test:
+	dh_auto_build -- test
 
-DEB_JARS := /usr/share/java/ant-junit.jar
-
-# override build and clean target
-DEB_ANT_BUILD_TARGET = compile 
-DEB_ANT_CLEAN_TARGET = clean
-
-# i want install and test rules to be run
-DEB_ANT_INSTALL_TARGET = jar
-DEB_ANT_CHECK_TARGET = test
-
-install/libdumbster-java::
-	mh_install -plibdumbster-java
-
-clean::
-	mh_clean
+override_dh_installchangelogs:
+	dh_installchangelogs -- version.txt
 
 get-orig-source:
 	bash debian/get_orig_source.sh

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