[checkstyle] 13/14: 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 checkstyle.

commit a504d7c50631da303056e2ff01907c83295184bb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 24 12:02:49 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 2c31cf9..c5dab84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ checkstyle (6.12.1-1) UNRELEASED; urgency=medium
   * Display the name of the exectutable instead of the class name
     in the help message
   * Removed the sources from the javadoc
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 21 May 2015 14:34:06 +0200
 
diff --git a/debian/control b/debian/control
index ec19751..5ce773e 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: Miguel Landaeta <miguel at miguel.cc>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant-optional, cdbs, debhelper (>= 9), default-jdk, javahelper
+Build-Depends: ant-optional, debhelper (>= 9), default-jdk, javahelper
 Build-Depends-Indep: antlr (>= 2.7.6),
                      antlr4-maven-plugin,
                      default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index ae5e838..13e8f33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,13 @@
 #!/usr/bin/make -f
-# debian/rules for checkstyle (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_COMPRESS_EXCLUDE_ALL := .xsl .java .xml
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc
-
-build/checkstyle::
+override_dh_auto_build:
+	dh_auto_build
 	pod2man -c '' -r '' debian/checkstyle.pod > target/checkstyle.1
 
-install/checkstyle::
-	jh_classpath
-	jh_installjavadoc
-
-clean::
-	jh_clean
-	-rm -rf debian/null
-
 get-orig-source:
-	uscan --verbose --rename --force-download --download-version $(DEB_UPSTREAM_VERSION)
+	uscan --verbose --rename --force-download --download-current-version

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