[spock] 04/06: Depend on libasm-java (>= 5.0) 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 spock.

commit 69683d92ff35f516fbfd9c9458e71eecfe7fdab5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 10 21:52:58 2016 +0200

    Depend on libasm-java (>= 5.0) instead of libasm4-java
---
 debian/build.xml   | 2 +-
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.rules | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index ca611bb..808da7b 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -22,7 +22,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
    <path id="groovyc.classpath">
     <fileset dir="/usr/share/java" includes="commons-cli.jar"/>
     <fileset dir="/usr/share/java" includes="groovy-all.jar"/>
-    <fileset dir="/usr/share/java" includes="asm4-all.jar"/>
+    <fileset dir="/usr/share/java" includes="asm-all.jar"/>
     <fileset dir="/usr/share/java" includes="antlr.jar"/>
    </path>
       
diff --git a/debian/changelog b/debian/changelog
index c0499da..bee4a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ spock (0.7-groovy-2.0-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on groovy instead of groovy2
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index e28a809..071a088 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: ant, debhelper (>= 9), default-jdk
 Build-Depends-Indep: groovy,
                      junit4,
                      libaopalliance-java,
-                     libasm4-java,
+                     libasm-java (>= 5.0),
                      libcglib3-java,
                      libguice-java,
                      libhamcrest-java,
@@ -25,7 +25,7 @@ Depends: ant,
          groovy,
          junit4,
          libaopalliance-java,
-         libasm4-java,
+         libasm-java (>= 5.0),
          libcglib3-java,
          libguice-java,
          libhamcrest-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 17a384f..7900fdd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,4 +18,3 @@
 
 junit s/junit-dep/junit/ jar s/.*/4.x/
 cglib cglib-nodep * s/.*/3.x/ * *
-org.ow2.asm asm * s/.*/4.x/ * *

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