[maven-hpi-plugin] 05/06: 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 maven-hpi-plugin.

commit 13d858a908cc455cc9c15fb7b57671032edfd353
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 14 00:22:19 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 7f6f603..276f93f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-hpi-plugin (1.93-4) UNRELEASED; urgency=medium
     when building Jenkins plugins with Maven 3
   * Fixed debian/watch
   * Removed the javadoc package
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 14 Dec 2015 00:05:08 +0100
 
diff --git a/debian/control b/debian/control
index a16f9c2..51442dd 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 <jamespage at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  ant-optional,
  junit (>= 3.8.2),
diff --git a/debian/rules b/debian/rules
index d95a470..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
 #!/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_ARGS :=  -e
-
-# Install POM files directly
-binary-post-install/libmaven-hpi-plugin-java::
-	mh_installpoms -plibmaven-hpi-plugin-java
+%:
+	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/maven-hpi-plugin.git