This is an automated email from the git hooks/post-receive script. komal-guest pushed a commit to branch master in repository proguard.
commit 8cc4626864b4de69d1c30053eb37d1f7411c289a Author: Komal Sukhani <[email protected]> Date: Mon Jul 27 23:07:44 2015 +0530 Enable building of proguard gradle task --- debian/patches/correct_properties_file_path.patch | 17 ++++++++++ .../patches/enable_building_of_gradle_task.patch | 37 ++++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 56 insertions(+) diff --git a/debian/patches/correct_properties_file_path.patch b/debian/patches/correct_properties_file_path.patch new file mode 100644 index 0000000..ef7f865 --- /dev/null +++ b/debian/patches/correct_properties_file_path.patch @@ -0,0 +1,17 @@ +Description: Correct path of build.properties file +Author: Komal Sukhani <[email protected]> +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 new file mode 100644 index 0000000..c4fff05 --- /dev/null +++ b/debian/patches/enable_building_of_gradle_task.patch @@ -0,0 +1,37 @@ +Description: Enable building of Proguard Gradle Task + This patch initialize gradle.home variable and change + version of gradle jar files. +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-07-27 +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-2.5.jar"/> ++ <property name = "gradle.jar2" value = "${gradle.home}/gradle-base-services-2.5.jar"/> ++ <property name = "gradle.jar3" value = "${gradle.home}/gradle-base-services-groovy-2.5.jar"/> ++ <property name = "gradle.jar4" value = "${gradle.home}/gradle-core-2.5.jar"/> ++ <property name = "gradle.jar5" value = "${gradle.home}/groovy-all-2.x.jar"/> + <property name = "wtk.jar" value = "${wtk.home}/wtklib/kenv.zip"/> + + <target name = "all" depends = "basic,options"/> diff --git a/debian/patches/series b/debian/patches/series index 0dcb4ab..d5bc325 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +enable_building_of_gradle_task.patch +correct_properties_file_path.patch add-bin.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
