[proguard] 02/08: Refreshed the patches

[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 3cafd1a8f44d62570534e4127537178d296184aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 09:52:45 2016 +0200

    Refreshed the patches
---
 debian/ant.properties                              |  1 +
 debian/changelog                                   |  8 +++++
 debian/patches/correct_properties_file_path.patch  | 17 ----------
 .../patches/enable_building_of_gradle_task.patch   | 37 ----------------------
 .../resolve_conflict_caused_by_openjdk8.patch      | 19 -----------
 debian/patches/series                              |  3 --
 debian/rules                                       |  6 ++--
 7 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..0a232ee
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1 @@
+gradle.home=/usr/share/gradle
diff --git a/debian/changelog b/debian/changelog
index 24724a3..f0cd77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proguard (5.3-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Sep 2016 09:22:37 +0200
+
 proguard (5.2.1-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/correct_properties_file_path.patch b/debian/patches/correct_properties_file_path.patch
deleted file mode 100644
index ef7f865..0000000
--- a/debian/patches/correct_properties_file_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Correct path of build.properties file
-Author: Komal Sukhani <komaldsukhani at gmail.com> 
-Forwarded: no 
-Last-Update: 2015-07-27
-Index: proguard/buildscripts/build.xml
-===================================================================
---- proguard.orig/buildscripts/build.xml
-+++ proguard/buildscripts/build.xml
-@@ -4,7 +4,7 @@
-          default = "all"
-          basedir = "..">
- 
--  <property file = "build/build.properties"/>
-+  <property file = "buildscripts/build.properties"/>
-   <property name = "src"     value = "src"/>
-   <property name = "classes" value = "classes"/>
-   <property name = "lib"     value = "lib"/>
diff --git a/debian/patches/enable_building_of_gradle_task.patch b/debian/patches/enable_building_of_gradle_task.patch
deleted file mode 100644
index 641b957..0000000
--- a/debian/patches/enable_building_of_gradle_task.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Enable building of Proguard Gradle Task
- This patch initialize gradle.home variable and change 
- version of gradle jar files. 
-Author: Komal Sukhani <komaldsukhani at gmail.com> 
-Forwarded: no 
-Last-Update: 2015-10-20
-Index: proguard/buildscripts/build.properties
-===================================================================
---- proguard.orig/buildscripts/build.properties
-+++ proguard/buildscripts/build.properties
-@@ -1,4 +1,4 @@
- # Ant build properties for ProGuard.
- 
--gradle.home = /usr/local/java/gradle
-+gradle.home = /usr/share/java
- wtk.home    = /usr/local/java/wtk
-Index: proguard/buildscripts/build.xml
-===================================================================
---- proguard.orig/buildscripts/build.xml
-+++ proguard/buildscripts/build.xml
-@@ -9,11 +9,11 @@
-   <property name = "classes" value = "classes"/>
-   <property name = "lib"     value = "lib"/>
- 
--  <property name = "gradle.jar1" value = "${gradle.home}/lib/plugins/gradle-plugins-2.2.1.jar"/>
--  <property name = "gradle.jar2" value = "${gradle.home}/lib/gradle-base-services-2.2.1.jar"/>
--  <property name = "gradle.jar3" value = "${gradle.home}/lib/gradle-base-services-groovy-2.2.1.jar"/>
--  <property name = "gradle.jar4" value = "${gradle.home}/lib/gradle-core-2.2.1.jar"/>
--  <property name = "gradle.jar5" value = "${gradle.home}/lib/groovy-all-2.3.6.jar"/>
-+  <property name = "gradle.jar1" value = "${gradle.home}/gradle-plugins.jar"/>
-+  <property name = "gradle.jar2" value = "${gradle.home}/gradle-base-services.jar"/>
-+  <property name = "gradle.jar3" value = "${gradle.home}/gradle-base-services-groovy.jar"/>
-+  <property name = "gradle.jar4" value = "${gradle.home}/gradle-core.jar"/>
-+  <property name = "gradle.jar5" value = "${gradle.home}/groovy-all.jar"/>
-   <property name = "wtk.jar"     value = "${wtk.home}/wtklib/kenv.zip"/>
- 
-   <target name = "all"     depends = "basic,options"/>
diff --git a/debian/patches/resolve_conflict_caused_by_openjdk8.patch b/debian/patches/resolve_conflict_caused_by_openjdk8.patch
deleted file mode 100644
index 8e02958..0000000
--- a/debian/patches/resolve_conflict_caused_by_openjdk8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fully qualify Optional annotation
- This patch resolves conflict caused by introduction of Optional class 
- in OpenJDK8. 
-Author: Komal Sukhani <komaldsukhani at gmail.com> 
-Forwarded: no 
-Last-Update: 2015-08-31
-Index: proguard/src/proguard/gradle/ProGuardTask.java
-===================================================================
---- proguard.orig/src/proguard/gradle/ProGuardTask.java
-+++ proguard/src/proguard/gradle/ProGuardTask.java
-@@ -68,7 +68,7 @@ public class ProGuardTask extends Defaul
-         return getProject().files(inJarFiles);
-     }
- 
--    @Optional @OutputFiles
-+    @org.gradle.api.tasks.Optional @OutputFiles
-     protected FileCollection getOutJarFileCollection()
-     {
-         return getProject().files(outJarFiles);
diff --git a/debian/patches/series b/debian/patches/series
index 2637257..0dcb4ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-enable_building_of_gradle_task.patch
-correct_properties_file_path.patch
 add-bin.patch
-resolve_conflict_caused_by_openjdk8.patch
diff --git a/debian/rules b/debian/rules
index 3992ebc..f7364a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,13 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --parallel --with maven-repo-helper --buildsystem=ant
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
 override_dh_auto_build:
-	ant -buildfile buildscripts/build.xml basic anttask gradletask
+	dh_auto_build -- -buildfile buildscripts/build.xml basic anttask gradletask
 
 override_dh_auto_clean:
-	ant -buildfile buildscripts/build.xml classes lib clean
+	dh_auto_build -- -buildfile buildscripts/build.xml classes lib clean
 
 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