[groovy2] 08/19: Refresh patches

[komal sukhani]

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

komal-guest pushed a commit to branch master
in repository groovy2.

commit 0ddae7e2d03f12a3d01aba4a52df7c9211b67caa
Author: komal <komaldsukhani at gmail.com>
Date:   Wed Jun 17 18:44:02 2015 +0530

    Refresh patches
---
 debian/patches/02_fix_gradle_build.diff | 38 ++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/debian/patches/02_fix_gradle_build.diff b/debian/patches/02_fix_gradle_build.diff
index 448b735..f874c27 100644
--- a/debian/patches/02_fix_gradle_build.diff
+++ b/debian/patches/02_fix_gradle_build.diff
@@ -1,7 +1,7 @@
-Index: debian-groovy2/build.gradle
+Index: groovy2-2.4.3/build.gradle
 ===================================================================
---- debian-groovy2.orig/build.gradle
-+++ debian-groovy2/build.gradle
+--- groovy2-2.4.3.orig/build.gradle
++++ groovy2-2.4.3/build.gradle
 @@ -1,29 +1,25 @@
  buildscript {
      repositories {
@@ -132,10 +132,10 @@ Index: debian-groovy2/build.gradle
      tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") {
          exclude(module: 'asm')
          exclude(module: 'asm')
-Index: debian-groovy2/gradle/utils.gradle
+Index: groovy2-2.4.3/gradle/utils.gradle
 ===================================================================
---- debian-groovy2.orig/gradle/utils.gradle
-+++ debian-groovy2/gradle/utils.gradle
+--- groovy2-2.4.3.orig/gradle/utils.gradle
++++ groovy2-2.4.3/gradle/utils.gradle
 @@ -24,7 +24,8 @@ import static org.objectweb.asm.Opcodes.
  
  buildscript {
@@ -146,10 +146,10 @@ Index: debian-groovy2/gradle/utils.gradle
      }
      dependencies {
          classpath "org.ow2.asm:asm:$asmVersion"
-Index: debian-groovy2/gradle/codehaus.gradle
+Index: groovy2-2.4.3/gradle/codehaus.gradle
 ===================================================================
---- debian-groovy2.orig/gradle/codehaus.gradle
-+++ debian-groovy2/gradle/codehaus.gradle
+--- groovy2-2.4.3.orig/gradle/codehaus.gradle
++++ groovy2-2.4.3/gradle/codehaus.gradle
 @@ -1,26 +1,27 @@
 -import com.github.sardine.*
 +/*import com.github.sardine.*
@@ -191,10 +191,10 @@ Index: debian-groovy2/gradle/codehaus.gradle
      }
 +*/
  }
-Index: debian-groovy2/gradle/quality.gradle
+Index: groovy2-2.4.3/gradle/quality.gradle
 ===================================================================
---- debian-groovy2.orig/gradle/quality.gradle
-+++ debian-groovy2/gradle/quality.gradle
+--- groovy2-2.4.3.orig/gradle/quality.gradle
++++ groovy2-2.4.3/gradle/quality.gradle
 @@ -1,5 +1,5 @@
 -import groovy.text.markup.MarkupTemplateEngine
 -import groovy.text.markup.TemplateConfiguration
@@ -227,3 +227,17 @@ Index: debian-groovy2/gradle/quality.gradle
      }
  
  }
+Index: groovy2-2.4.3/gradle/assemble.gradle
+===================================================================
+--- groovy2-2.4.3.orig/gradle/assemble.gradle
++++ groovy2-2.4.3/gradle/assemble.gradle
+@@ -218,9 +218,6 @@ allprojects {
+                     taskdef name: 'jarjar', classname: 'com.tonicsystems.jarjar.JarJarTask', classpath: rootProject.configurations.tools.asPath
+                     jarjar(jarfile: target) {
+                         zipfileset(src: jarjar.archivePath)
+-                        if (isRootProject) {
+-                            zipfileset(src: rootProject.configurations.runtime.files.find { it.name.startsWith('openbeans') })
+-                        }
+                         rule pattern: 'com.googlecode.openbeans.**', result: 'groovyjarjaropenbeans. at 1'
+                         rule pattern: 'org.apache.harmony.beans.**', result: 'groovyjarjarharmonybeans. at 1'
+                         rule pattern: 'java.beans.**', result: 'groovyjarjaropenbeans. at 1'

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