This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository groovy2.
commit 4a793aa8a7c1f1c82d2220c8b3b81e528e91be43 Author: Emmanuel Bourg <[email protected]> Date: Mon May 2 19:25:28 2016 +0200 Refreshed the patches --- debian/changelog | 4 +++- debian/patches/01_fix_doc_gradle.diff | 7 ++----- debian/patches/02_fix_start_script.diff | 2 +- debian/patches/05_buildscripts_dependencies.diff | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1b1d0d..9fe7e29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -groovy (2.4.5-2) UNRELEASED; urgency=medium +groovy (2.4.6-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Reverted to groovy as the package name * Depend on libasm-java (>= 5.0) instead of libasm4-java * Removed the build dependency on libcobertura-java diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff index 9d13ef2..9b3c427 100644 --- a/debian/patches/01_fix_doc_gradle.diff +++ b/debian/patches/01_fix_doc_gradle.diff @@ -1,9 +1,6 @@ Description: Remove code of asciidoctor-gradle-plugin Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Forwarded: not-needed --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -17,24 +17,10 @@ @@ -13,7 +10,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ - if (JavaVersion.current().java7Compatible) { - dependsOn 'asciidocAll', 'assembleAsciidoc' - } - ext.footer = 'Copyright © 2003-2015 The Apache Software Foundation. All rights reserved.' + ext.footer = 'Copyright © 2003-2016 The Apache Software Foundation. All rights reserved.' ext.title = "Groovy ${groovyVersion}" } diff --git a/debian/patches/02_fix_start_script.diff b/debian/patches/02_fix_start_script.diff index 7c9acdf..8d34503 100644 --- a/debian/patches/02_fix_start_script.diff +++ b/debian/patches/02_fix_start_script.diff @@ -20,7 +20,7 @@ Last-Update: 2013-10-27 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -@@ -90,7 +94,7 @@ +@@ -94,7 +98,7 @@ [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home" [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" else diff --git a/debian/patches/05_buildscripts_dependencies.diff b/debian/patches/05_buildscripts_dependencies.diff index 75a7ebf..a598196 100644 --- a/debian/patches/05_buildscripts_dependencies.diff +++ b/debian/patches/05_buildscripts_dependencies.diff @@ -4,7 +4,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/gradle/utils.gradle +++ b/gradle/utils.gradle -@@ -26,10 +26,10 @@ +@@ -32,10 +32,10 @@ buildscript { repositories { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
