[stapler] 02/03: 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 stapler.

commit 73f536174682c9e185a1a97688c50f7bbafcf4e7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 20 12:35:04 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index af46924..d7c1fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ stapler (1.231-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Transition to Groovy 2
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Nov 2015 12:05:50 +0100
 
diff --git a/debian/control b/debian/control
index 666b5af..396cbe3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <jamespage at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 9),
  default-jdk,
  javahelper,
diff --git a/debian/rules b/debian/rules
index ebde71d..3ddb50e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.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_BUILD_TARGET := install
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven --with javahelper
+
+override_dh_auto_build:
+	dh_auto_build -- install javadoc:jar javadoc:aggregate
 
 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/stapler.git