[libcommons-fileupload-java] 03/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 libcommons-fileupload-java.

commit b5176c517edbc48b2269ea2e288d04f5ef51e63a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat May 28 22:16:13 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog         |  1 +
 debian/control           |  5 ++---
 debian/maven.ignoreRules |  1 +
 debian/rules             | 12 +++++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 730083f..ce259e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcommons-fileupload-java (1.3.1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* fields
 
diff --git a/debian/control b/debian/control
index 068477d..24079d7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,12 @@ 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 (>= 2.0)
 Build-Depends-Indep: junit4,
                      libcommons-io-java,
                      libmaven-javadoc-plugin-java,
                      libportlet-api-2.0-spec-java,
-                     libservlet3.0-java,
-                     maven-repo-helper
+                     libservlet3.0-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libcommons-fileupload-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-fileupload-java.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 70a7cf0..7995388 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -5,3 +5,4 @@ org.apache.maven.plugins maven-changes-plugin maven-plugin * * *
 org.apache.maven.plugins maven-checkstyle-plugin maven-plugin * * *
 org.apache.maven.plugins maven-pmd-plugin maven-plugin * * *
 org.apache.maven.plugins maven-release-plugin maven-plugin * * *
+org.codehaus.mojo clirr-maven-plugin * * *
diff --git a/debian/rules b/debian/rules
index 52094ac..28b8c6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules for Commons Fileupload (uses CDBS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
-
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+override_dh_installchangelogs:
+	dh_installchangelogs -- RELEASE-NOTES.txt
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-current-version --force-download --rename --repack --compression xz

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