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

commit 27b5a08405cd8f9dfe19405759f1bd4ad4cdf5ef
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 16 09:43:11 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 8d33a2a..87a1b1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 bookkeeper (4.2.4-4) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4a8339a
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+bookkeeper-server/lib/
+bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/DataFormats.java
+hedwig-protocol/src/main/java/org/apache/hedwig/protocol/PubSubProtocol.java
diff --git a/debian/control b/debian/control
index 8975107..05b2ef4 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 (>= 10),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                junit4,
                libcommons-cli-java,
diff --git a/debian/rules b/debian/rules
index 2deb7d5..0f9dbba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_ARGS := -Pprotobuf
-
-clean::
-	rm -Rf bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/DataFormats.java
-	rm -Rf hedwig-protocol/src/main/java/org/apache/hedwig/protocol/PubSubProtocol.java
+override_dh_auto_build:
+	dh_auto_build -- package -Pprotobuf
 
 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/bookkeeper.git