[libjgoodies-common-java] 01/04: use dh+javahelper instead of cdbs

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjgoodies-common-java.

commit cc39ec3f424128dd4a773d207faff758f4444ebb
Author: tony mancill <tmancill at debian.org>
Date:   Thu Jan 28 22:05:39 2016 -0800

    use dh+javahelper instead of cdbs
---
 debian/changelog |  3 ++-
 debian/control   |  4 ++--
 debian/rules     | 15 +++++----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2712358..7e7161d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libjgoodies-common-java (1.7.0-1) UNRELEASED; urgency=medium
+libjgoodies-common-java (1.7.0-2) UNRELEASED; urgency=medium
 
   [ tony mancill ]
   * New upstream version. (Closes: #812558)
   * Use DH 9.
   * Add build patch to disable parent in upstream pom.
   * Bump Standards-Version to 3.9.6.
+  * Switch from cdbs to dh+javahelper.
 
   [ gregor herrmann ]
   * Use nicer URL for Vcs-Browser.
diff --git a/debian/control b/debian/control
index 17ffe46..20fc757 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Uploaders: gregor herrmann <gregoa at debian.org>,
            tony mancill <tmancill at debian.org>
 Section: java
 Priority: optional
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
+               javahelper,
                maven-debian-helper (>= 1.5),
                xauth,
                xvfb
diff --git a/debian/rules b/debian/rules
index 28ce069..8e8d3a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-# ugly, but DEB_MAKE_CHECK_INVOKE doesn't seem to be implemented yet
-# and maven-sanity-check fails with the compund JAVACMD
-export JAVACMD := xvfb-run -a $(JAVACMD)
-maven-sanity-check:
-	true
+override_dh_installchangelogs:
+	dh_installchangelogs -- RELEASE-NOTES.txt
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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