[jcommander] 15/17: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Feb 2 22:46:41 UTC 2016


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

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

commit 2ff6ca9c03aee968ef8d3f285878016bf146a89a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Feb 2 23:30:14 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a3dab80..e1a7fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jcommander (1.35-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Standards-Version updated to 3.9.7 (no changes)
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 02 Feb 2016 21:50:58 +0100
diff --git a/debian/control b/debian/control
index a6d5847..327836f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java, default-jdk-doc
 Standards-Version: 3.9.7
 Vcs-Git: git://anonscm.debian.org/pkg-java/jcommander.git
diff --git a/debian/rules b/debian/rules
index b76c54a..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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
+%:
+	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/jcommander.git



More information about the pkg-java-commits mailing list