[guava-libraries] 01/03: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Dec 17 23:04:59 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository guava-libraries.

commit 29fea45cea9a601f8ee392b8f053472e0cffd03b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 23:49:35 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 132e93c..53e1d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guava-libraries (18.0-5) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Dec 2015 23:46:32 +0100
+
 guava-libraries (18.0-4) unstable; urgency=medium
 
   * Improved the backward compatibility:
diff --git a/debian/control b/debian/control
index 43402ca..8be7025 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Miguel Landaeta <miguel at miguel.cc>,
            Emmanuel Bourg <ebourg at apache.org>,
            James Page <james.page at canonical.com>
-Build-Depends: cdbs, debhelper (>= 9~), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9~), default-jdk, maven-debian-helper
 Build-Depends-Indep: libatinject-jsr330-api-java,
                      libjsr305-java,
                      libmaven-bundle-plugin-java,
diff --git a/debian/rules b/debian/rules
index b0164e1..46be23a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	-uscan --download-current-version --force-download --rename

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



More information about the pkg-java-commits mailing list