[doxia] 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 doxia.

commit f02dab743babb2bf442dd99714e8a935e6660296
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 5 17:55:21 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index ca190e1..9cfdd58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ doxia (1.1.4-4) UNRELEASED; urgency=medium
 
   * Team upload.
   * Imported the patch from Fedora fixing the compatibility with FOP 2.0
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 05 Jan 2016 16:19:13 +0100
 
diff --git a/debian/control b/debian/control
index 5185c87..dc31d39 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index 562f1f3..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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_DOC_TARGET := javadoc:jar javadoc:aggregate
+%:
+	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/doxia.git