[proguard] 03/08: Build with Gradle instead of Ant

[Emmanuel Bourg]

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

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

commit 21b26a18f934e621bf3869fc04220a9a87f02d95
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 10:05:55 2016 +0200

    Build with Gradle instead of Ant
---
 debian/ant.properties | 1 -
 debian/changelog      | 1 +
 debian/control        | 2 +-
 debian/rules          | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 0a232ee..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-gradle.home=/usr/share/gradle
diff --git a/debian/changelog b/debian/changelog
index f0cd77c..63faca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ proguard (5.3-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Build with Gradle instead of Ant
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Sep 2016 09:22:37 +0200
 
diff --git a/debian/control b/debian/control
index a176386..088aee9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  ant,
  debhelper (>= 9),
  default-jdk,
- gradle (>=2.5),
+ gradle-debian-helper,
  maven-repo-helper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/proguard.git
diff --git a/debian/rules b/debian/rules
index f7364a5..9615f99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,14 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=ant --with maven-repo-helper
+	dh $@ --buildsystem=gradle --with maven-repo-helper
 
 override_dh_auto_build:
-	dh_auto_build -- -buildfile buildscripts/build.xml basic anttask gradletask
+	dh_auto_build -- -p buildscripts
 
 override_dh_auto_clean:
-	dh_auto_build -- -buildfile buildscripts/build.xml classes lib clean
+	dh_auto_clean
+	rm -Rf lib buildscripts/.gradle
 
 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