[libcommons-cli-java] 01/08: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Dec 15 12:07:38 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository libcommons-cli-java.

commit 445386f927ffa8efc7550a6733c8d1110538b2ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 15 12:12:35 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  7 +++++++
 debian/control   |  2 --
 debian/rules     | 19 ++++---------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2397e02..64d6f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcommons-cli-java (1.3.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 15 Dec 2015 12:11:08 +0100
+
 libcommons-cli-java (1.3.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e09261d..0a0a5a4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,11 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
  tony mancill <tmancill at debian.org>
 Build-Depends: debhelper (>= 9),
- cdbs (>= 0.4.8),
  default-jdk,
  ant,
  ant-optional,
  libmaven-antrun-plugin-java,
  maven-debian-helper,
- maven-repo-helper,
  libmaven-assembly-plugin-java,
  libcommons-lang-java (>= 2.0),
  junit4
diff --git a/debian/rules b/debian/rules
index a4bddcd..cfc045d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,10 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-
-binary-post-install/$(PACKAGE)::
-	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -l pom.xml target/commons-cli-$(VERSION).jar
-
-clean::
-	-rm -rf debian/tmp
+%:
+	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/libcommons-cli-java.git



More information about the pkg-java-commits mailing list