[gradle] 02/03: Depend on libasm-java instead of libasm4-java

[Emmanuel Bourg]

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

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

commit 2b0da7385e3234c7a6734494f6cfa527c3f8dbdd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Apr 24 19:41:10 2016 +0200

    Depend on libasm-java instead of libasm4-java
---
 debian/changelog                        | 1 +
 debian/control                          | 4 ++--
 debian/patches/use_local_artifacts.diff | 8 +-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 669f6c8..1cb9dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gradle (2.10-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the unused dependency on libclassworlds-java
+  * Depend on libasm-java instead of libasm4-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 24 Apr 2016 19:27:30 +0200
 
diff --git a/debian/control b/debian/control
index ba1726c..0482416 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: ant,
                javahelper,
                junit4,
                libantlr-java,
-               libasm4-java (>= 5),
+               libasm-java (>= 5.0),
                libatinject-jsr330-api-java,
                libbcpg-java,
                libcglib3-java,
@@ -105,7 +105,7 @@ Architecture: all
 Depends: ant,
          groovy2 (>= 2.3.10),
          ivy,
-         libasm4-java (>= 5),
+         libasm-java (>= 5.0),
          libatinject-jsr330-api-java,
          libcommons-collections3-java,
          libcommons-io-java,
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 9b54a10..879b0ce 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -54,13 +54,7 @@ Last-Update: 2015-07-08
  apply from: '../gradle/taskOrdering.gradle'
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
-@@ -29,18 +29,18 @@
-     dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
- }
- 
--libraries.asm =  'org.ow2.asm:asm-all:5.0.3'
-+libraries.asm =  'org.ow2.asm:asm4-all'
- libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib:2.4.0')
+@@ -34,13 +34,13 @@
  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'

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