[jsap] 03/04: 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 jsap.

commit 1aa32f65f6dd42fd20c6e6f5002715ce90d61bbf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 18 19:33:25 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 825b663..9386db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jsap (2.1-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Added the missing build dependency on Ant
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 18 Jul 2016 19:28:00 +0200
diff --git a/debian/control b/debian/control
index 47a8297..2c9518b 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: Guillaume Turri <guillaume.turri at gmail.com>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
 Build-Depends-Indep: libxstream-java, junit4, default-jdk-doc, libmaven-javadoc-plugin-java, ant
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jsap.git
diff --git a/debian/rules b/debian/rules
index 3808e63..8db6635 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-pre-build::
+override_dh_auto_configure:
 	# Project Mavenization
 	cp debian/pom.xml .
 
@@ -18,9 +16,10 @@ pre-build::
 	mv src/main/java/com/martiansoftware/jsap/defaultsources/Test* src/test/java/com/martiansoftware/jsap/defaultsources/
 	mv src/main/java/com/martiansoftware/jsap/stringparsers/Test*  src/test/java/com/martiansoftware/jsap/stringparsers/
 
-	mh_patchpoms -plibjsap-java --keep-pom-version
+	dh_auto_configure
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f pom.xml
 	rm -rf src/main
 	rm -rf src/test

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