[jasypt] 03/09: 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 jasypt.

commit 1f0619dabeb9d1cd2d5fa29b8911d3aca277dc69
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 18 09:53:47 2016 +0200

    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 a035470..5419870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jasypt (1.8-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index 8f5bd9b..c75b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +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),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
                glassfish-javaee,
@@ -20,7 +19,7 @@ Build-Depends: cdbs,
                libspring-core-java,
                libspring-transaction-java,
                libspring-web-java,
-               maven-debian-helper (>= 1.4)
+               maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jasypt.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jasypt.git
diff --git a/debian/rules b/debian/rules
index a4c6f84..239466f 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:
 	sh debian/cvs-get.sh	

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