[doxia-sitetools] 05/06: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jun 22 08:39:59 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository doxia-sitetools.

commit 255fe3df2a977aadcd78de02935c6e62180ce5af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 22 10:02:40 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 7b34227..db45222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 doxia-sitetools (1.1.4-1.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Removed Michael Koch from the uploaders (Closes: #654014)
   * Standards-Version updated to 3.9.8
diff --git a/debian/control b/debian/control
index 29b204a..cd36bd0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>,
            Ludovic Claude <ludovic.claude at laposte.net>
-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..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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
+%:
+	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-sitetools.git



More information about the pkg-java-commits mailing list