[scannotation] 04/05: 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 scannotation.

commit e54c54cfa5ff66eeb9822a589e7b95b0c595846a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 14 13:48:56 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1a5ca6c..4e514c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ scannotation (1.0.2+svn20110812-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Completed the transition to the Servlet API 3.1 (Closes: #831062)
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index d246744..2ee7a96 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                javahelper,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.0)
 Build-Depends-Indep: libjavassist-java, libservlet3.1-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/scannotation.git
diff --git a/debian/rules b/debian/rules
index 0ee93b6..4cd39bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
 get-orig-source:
 	debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)

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