[libgoogle-gson-java] 04/05: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sat Sep 16 20:22:14 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository libgoogle-gson-java.

commit 5b0ff2ea5fd93ff69394c85d8b0db1be6ab9c687
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Sep 16 19:55:26 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1bbab97..c06b377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libgoogle-gson-java (2.4-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Added the missing build dependency on junit4
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index b73b292..6b7c826 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 10),
-               cdbs,
                default-jdk,
                junit4,
                libmaven-javadoc-plugin-java,
diff --git a/debian/rules b/debian/rules
index 44fe611..364dd16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,17 @@
 #!/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
+%:
+	dh $@ --buildsystem=maven
 
-DEB_MAVEN_ARGS := --file gson/pom.xml
+override_dh_auto_build:
+	dh_auto_build -- --file gson/pom.xml
+
+override_dh_auto_test:
+	dh_auto_test -- --file gson/pom.xml
+
+override_dh_auto_install:
+	dh_auto_install -- --file gson/pom.xml
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --force-download --download-current-version --rename

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



More information about the pkg-java-commits mailing list