[gradle-1.12] 132/211: d/patches/fix_asm5_version.diff: Fix ASM version mismatch

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository gradle-1.12.

commit 98f8abc3ac2cb31f417c528a7aa6dcea4032aa73
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun May 31 21:51:25 2015 +0800

    d/patches/fix_asm5_version.diff: Fix ASM version mismatch
---
 debian/changelog                          |  1 +
 debian/control                            |  2 +-
 debian/patches/13_fix_javadocs_links.diff |  8 ++++----
 debian/patches/fix_asm5_version.diff      | 16 ++++++++++++++++
 debian/patches/series                     |  1 +
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46182d7..b441117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gradle (1.12-1) UNRELEASED; urgency=low
     - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
   * Remove all symlinks
   * Abandon 90_respect_user_java_home.diff
+  * d/patches/fix_asm5_version.diff: Fix ASM version mismatch
   * d/docs: Add LICENSE and NOTICE to every package
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Thu, 21 May 2015 16:02:50 +0800
diff --git a/debian/control b/debian/control
index f8b9772..51ff428 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: ant (>= 1.8),
                junit4,
                libaether-java,
                libantlr-java,
-               libasm4-java,
+               libasm4-java (>= 5),
                libbcpg-java,
                libbcprov-java,
                libclassycle-java,
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index 5d4ac4c..f256271 100644
--- a/debian/patches/13_fix_javadocs_links.diff
+++ b/debian/patches/13_fix_javadocs_links.diff
@@ -6,20 +6,20 @@ Last-Update: 2012-08-18
 
 --- a/subprojects/docs/docs.gradle
 +++ b/subprojects/docs/docs.gradle
-@@ -306,8 +306,10 @@
+@@ -291,8 +291,10 @@
      classpath = configurations.userGuideTask
  }
-
+ 
 -def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
 -def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
 +//def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
 +def javaApiUrl = "file:///usr/share/doc/default-jdk-doc/api"
 +//def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
 +def groovyApiUrl = "file:///usr/share/doc/groovy-doc/gapi/"
-
+ 
  task javadocAll(type: Javadoc) {
      ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -334,8 +336,7 @@
+@@ -319,8 +321,7 @@
      include 'org/gradle/testing/jacoco/**'
      include 'org/gradle/buildinit/**'
      exclude '**/internal/**'
diff --git a/debian/patches/fix_asm5_version.diff b/debian/patches/fix_asm5_version.diff
new file mode 100644
index 0000000..5d4dbc9
--- /dev/null
+++ b/debian/patches/fix_asm5_version.diff
@@ -0,0 +1,16 @@
+Description: Gradle uses ASM 5.x but in Debian ASM 5.x is in libasm4-java
+             which causes version mismatch.
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-05-31
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -25,7 +25,8 @@
+     dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
+ }
+ 
+-libraries.asm =  'org.ow2.asm:asm-all:5.0_BETA at jar'
++//libraries.asm =  'org.ow2.asm:asm-all:5.0_BETA at jar'
++libraries.asm = "org.ow2.asm:asm-all:[5.0, )]"
+ libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
+ libraries.commons_io = dependencies.module(versions.commons_io)
+ libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
diff --git a/debian/patches/series b/debian/patches/series
index 89ebb0f..fb46610 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 use_local_artifacts.diff
 do_not_use_jdk5_guava.diff
+fix_asm5_version.diff
 fix_DocGenerationException.diff
 03_plexus.diff
 13_fix_javadocs_links.diff

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