[asm] 03/03: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Nov 29 00:03:02 UTC 2016


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

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

commit 87bf5c066f3e6eaef9c11c0560dea9c1391f8913
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 29 01:00:39 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 15e8348..ad4d9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 asm (5.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * debian/copyright: Credited Eugene Kuleshov
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 949c00d..c045813 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Aditya Vaidya <kroq.gar78 at gmail.com>,
            Emmanuel Bourg <ebourg at apache.org>,
            Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 10), default-jdk
+Build-Depends: debhelper (>= 10), default-jdk
 Build-Depends-Indep: ant, maven-repo-helper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/asm.git
diff --git a/debian/rules b/debian/rules
index 0c1e686..734f78c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,22 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+VERSION ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
-PACKAGE              := libasm-java
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant ant-junit junit
-DEB_ANT_BUILD_TARGET := jar jdoc examples
-DEB_ANT_ARGS         := -propertyfile debian/ant.properties -Dproduct.version=$(VERSION)
+%:
+	dh $@ --with maven-repo-helper
 
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+override_dh_auto_build:
+	dh_auto_build -- jar jdoc examples
 
-binary-post-install/$(PACKAGE)::
+override_mh_install:
 	mh_install -e$(VERSION)
-	rm debian/$(PACKAGE)/usr/share/java/asm-debug-all-$(VERSION).jar
+
+override_dh_link:
+	dh_link
+
+	# Link asm-debug-all.jar to asm-all.jar
+	rm debian/libasm-java/usr/share/java/asm-debug-all-*.jar
 	dh_link usr/share/java/asm-all-$(VERSION).jar usr/share/java/asm-debug-all-$(VERSION).jar
 
-clean::
-	mh_clean
+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/asm.git



More information about the pkg-java-commits mailing list