[commons-configuration] 02/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 commons-configuration.

commit 7b3e2d285c0d144d10237daf1d848d4796bc3ece
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 08:58:47 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                                 |  1 +
 debian/control                                   |  2 +-
 debian/libcommons-configuration-java-doc.install |  1 +
 debian/rules                                     | 22 ++++++----------------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a839ce..6938303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 commons-configuration (1.10-4) UNRELEASED; urgency=medium
 
   * Ignore the scm-publish plugin to fix the build failure with Maven 3
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Dec 2015 08:37:46 +0100
 
diff --git a/debian/control b/debian/control
index 6d7841a..c964fcc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Torsten Werner <twerner at debian.org>,
            Damien Raude-Morvan <drazzib at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper, javahelper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper, javahelper
 Build-Depends-Indep: ant,
                      default-jdk-doc,
                      libmail-java,
diff --git a/debian/libcommons-configuration-java-doc.install b/debian/libcommons-configuration-java-doc.install
new file mode 100644
index 0000000..72a3a7b0
--- /dev/null
+++ b/debian/libcommons-configuration-java-doc.install
@@ -0,0 +1 @@
+target/site/apidocs/* usr/share/doc/libcommons-configuration-java/api/
diff --git a/debian/rules b/debian/rules
index 31ab53d..33cce0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +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
 
-PACKAGE			   := $(DEB_SOURCE_PACKAGE)
-VERSION			   := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME                  := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-API_DOCS                   := target/site/apidocs/*
-DEB_MAVEN_DOC_TARGET       := javadoc:aggregate
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
-
-binary-post-install/lib$(PACKAGE)-java::
-	jh_classpath -plib$(PACKAGE)-java
-
-binary-post-install/lib$(PACKAGE)-java-doc::
-	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java/api/
+override_dh_installchangelogs:
+	dh_installchangelogs RELEASE-NOTES.txt
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
+	uscan --download-current-version --force-download --rename

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