[apache-curator] 01/01: 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 apache-curator.

commit 70706f07b93df4f4036842874af5ec8c3117a53d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 7 11:41:44 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 6361f56..a21d9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache-curator (2.7.1-2) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Dec 2015 11:40:21 +0100
+
 apache-curator (2.7.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #776493)
diff --git a/debian/control b/debian/control
index 7473396..6b95753 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: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                libcommons-math-java,
                libguava-java,
diff --git a/debian/rules b/debian/rules
index 948ec97..7f1a475 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,20 @@
 #!/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:javadoc javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven
 
-configure/libcurator-parent-java::
+override_dh_auto_build:
 	# Regenerate the Java classes from the Thrift files
 	sed -i 's/^namespace java.swift/\/\/namespace java.swift/g' curator-x-rpc/src/main/thrift/curator.thrift
 	cd curator-x-rpc/src/main/scripts && bash apply-thrift.sh java
 
-clean::
+	dh_auto_build
+
+override_dh_auto_clean:
 	sed -i 's/\/\/namespace/namespace/g' curator-x-rpc/src/main/thrift/curator.thrift
+	dh_auto_clean
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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