[htrace] 03/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 htrace.

commit 43cca12e168344695c7105df65a995459db2f7f8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Feb 28 23:06:04 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index d12b8e9..7bad278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 htrace (3.1.0-2) UNRELEASED; urgency=medium
 
   * Removed the unused build dependency on libjetty-java
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.7 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 28 Feb 2016 22:58:00 +0100
diff --git a/debian/control b/debian/control
index a2768ee..086e90c 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,
                junit4,
                libcommons-logging-java,
diff --git a/debian/rules b/debian/rules
index 21dfad5..1fe5e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-configure/libhtrace-core-java::
+override_dh_auto_configure:
+	dh_auto_configure
 	# Regenerate the Java classes from the Thrift files
 	bash bin/gen_thrift.sh
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f htrace-zipkin/src/main/java/com/twitter/zipkin/gen/*
 
 get-orig-source:

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