[jruby-joni] 01/05: 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 debian/sid
in repository jruby-joni.

commit 374cd4c97e48b697560a5b35a73be07abf5a64cf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 22:09:33 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 26c63c7..6def06d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jruby-joni (2.1.11-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Oct 2016 22:07:41 +0200
+
 jruby-joni (2.1.11-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 222518d..a8b2d99 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Hideki Yamane <henrich at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), default-jdk
-Build-Depends-Indep: ant, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3),
+Build-Depends-Indep: ant, libjcodings-java (>= 1.0.13), libasm-java (>= 5.0),
  maven-debian-helper
 Standards-Version: 3.9.8
 Homepage: https://github.com/jruby/joni/
@@ -14,7 +14,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jruby-joni.git
 
 Package: libjruby-joni-java
 Architecture: all
-Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3),
+Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm-java (>= 5.0),
 Description: Java port of Oniguruma regexp library 
  Oniguruma is a regular expressions library.  The characteristics of this
  library is that different character encoding for every regular expression
diff --git a/debian/maven.rules b/debian/maven.rules
index e607c6e..0f55ad0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,2 @@
 junit junit * s/.*/3.x/ * *
 org.jruby.jcodings jcodings * s/.*/debian/ * *
-org.ow2.asm asm * s/.*/4.x/ * *
diff --git a/debian/patches/build.xml-jcoding.patch b/debian/patches/build.xml-jcoding.patch
index f205576..2594f1d 100644
--- a/debian/patches/build.xml-jcoding.patch
+++ b/debian/patches/build.xml-jcoding.patch
@@ -19,7 +19,7 @@ index 04a54ef..312aabf 100644
 +        <javac srcdir="${src.dir}" destdir="${bin.dir}">
 +            <classpath>
 +                <pathelement location="/usr/share/java/jcodings.jar" />
-+                <pathelement location="/usr/share/java/asm4.jar" />
++                <pathelement location="/usr/share/java/asm.jar" />
 +            </classpath>
 +        </javac>
      </target>
@@ -30,7 +30,7 @@ index 04a54ef..312aabf 100644
                  <attribute name="Built-Date" value="${buildDate}" />
                  <attribute name="Built-Time" value="${buildTime}" />
 +                <attribute name="Class-Path" value="/usr/share/java/jcodings.jar
-+                                                    /usr/share/java/asm4.jar" />
++                                                    /usr/share/java/asm.jar" />
              </manifest>
          </jar>
  

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