[proguard] 02/12: Switch from cdbs to dh sequencer.

Markus Koschany apo-guest at moszumanska.debian.org
Sat Feb 6 19:21:33 UTC 2016


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

apo-guest pushed a commit to branch master
in repository proguard.

commit 0c6cd9bd77d31779cf234d430580d8df732fd7d8
Author: Markus Koschany <apo at debian.org>
Date:   Sat Feb 6 18:48:47 2016 +0100

    Switch from cdbs to dh sequencer.
---
 debian/control |  1 -
 debian/rules   | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 8b5470b..e458074 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Komal Sukhani <komaldsukhani at gmail.com>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 9),
  default-jdk,
  gradle (>=2.5)
diff --git a/debian/rules b/debian/rules
index 741dcb1..25c4f06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --parallel --buildsystem=ant
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+override_dh_auto_build:
+	dh_auto_build -buildfile buildscripts/build.xml basic anttask gradletask
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE	:= buildscripts/build.xml
-DEB_ANT_BUILD_TARGET	:= basic anttask gradletask
-DEB_ANT_ARGS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+get-orig-source:
+	uscan --verbose --download-current-version --force-download

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



More information about the pkg-java-commits mailing list