[groovy] 14/23: 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 groovy.

commit 9a910be66600e83ff0132e47d77c57b8589c027e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 10 23:31:56 2018 +0100

    Refreshed the patches
---
 debian/changelog                      |  2 +-
 debian/patches/01_fix_doc_gradle.diff | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8389014..bae3e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-groovy (2.4.11-1) UNRELEASED; urgency=medium
+groovy (2.4.12-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff
index 4a5fef0..c4d27f1 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -28,7 +28,7 @@ Forwarded: not-needed
  def javadocSpec = {
      maxMemory = javaDoc_mx
      project.configure(options) {
-@@ -125,71 +111,10 @@
+@@ -125,73 +111,10 @@
  
  task docGDK {
  //    ext.extraDocGDKclasses = []
@@ -77,6 +77,8 @@ Forwarded: not-needed
 -                    if(JavaVersion.current().isJava7Compatible()) {
 -                        arg(value: 'subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java')
 -                    }
+-                    arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java')
+-                    arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java')
 -                }
 -            }
 -        } finally {
@@ -100,13 +102,6 @@ Forwarded: not-needed
  }
  
  if (JavaVersion.current().isJava7Compatible()) {
-@@ -203,4 +128,4 @@
-             options.addStringOption('Xdoclint:none', '-quiet')
-         }
-     }
--}
-\ No newline at end of file
-+}
 --- a/build.gradle
 +++ b/build.gradle
 @@ -65,7 +65,6 @@

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