[bridge-method-injector] 07/08: 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 bridge-method-injector.

commit fec48f6c50ea977c8cc37fba3fcdbeabe1301802
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 28 00:08:19 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index ff2047f..7a5b641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bridge-method-injector (1.14-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
   * debian/watch: No longer use githubredir.debian.net
diff --git a/debian/control b/debian/control
index 95578e8..05461fe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
 Build-Depends-Indep:
  default-jdk-doc,
  junit (>= 3.8.1),
diff --git a/debian/rules b/debian/rules
index 722396c..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
-DEB_MAVEN_BUILD_TARGET := install 
+%:
+	dh $@ --buildsystem=maven
 
 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/bridge-method-injector.git