[wagon2] 02/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 wagon2.

commit d5bea49999430f5fe93ab85f3d358ae636bc834f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 14 13:47:46 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 4064f03..30aefd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ wagon2 (2.10-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure with Maven 3
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 14 Dec 2015 13:43:07 +0100
 
diff --git a/debian/control b/debian/control
index 5c49ef8..5966df2 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: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep: default-jdk-doc,
                      junit,
                      libbcprov-java,
diff --git a/debian/rules b/debian/rules
index 404e5d1..aa51c89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,22 @@
 #!/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_DOC_TARGET := javadoc:jar javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven
 
-makebuilddir::
+override_dh_auto_build:
 	-mkdir -p $(CURDIR)/wagon-providers/wagon-scm/target/test-classes/
 	-svnadmin create $(CURDIR)/wagon-providers/wagon-scm/target/test-classes/test-repo-svn
+	dh_auto_build
 
-cleanbuilddir::
+override_dh_auto_clean:
 	-rm -Rf $(CURDIR)/wagon-providers/wagon-scm/target/test-classes/test-repo-svn
+	dh_auto_clean
 
-binary-post-install/libwagon2-java::
+override_dh_auto_install:
+	dh_auto_install
 	mh_installjar -plibwagon2-java --java-lib --no-usj-versionless --usj-name=wagon-http-shaded --usj-version=2.x --classifier=shaded wagon-providers/wagon-http/pom.xml wagon-providers/wagon-http/target/wagon-http-*-shaded.jar
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+	uscan --download-current-version --force-download --no-symlink --repack

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