[jruby-joni] 02/03: fix #800852

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 65c00d065ea15f32a38960bfc3a8c354c6232d58
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Nov 17 06:03:46 2015 +0900

    fix #800852
---
 debian/changelog                       | 3 +++
 debian/control                         | 4 ++--
 debian/patches/build.xml-jcoding.patch | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30f0baa..0f098f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ jruby-joni (2.1.8-2) UNRELEASED; urgency=medium
 
   * debian/control
     - adjust libjcodings-java version to >= 1.0.13
+    - use libasm4-java, instead of 3 (Closes: #800852)
+  * debian/patches
+    - update build.xml-jcoding.patch to use asm4
 
  -- Hideki Yamane <henrich at debian.org>  Mon, 16 Nov 2015 21:42:24 +0900
 
diff --git a/debian/control b/debian/control
index fa9fc03..6b7ee9d 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), libasm3-java,
+Build-Depends-Indep: ant, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3),
  maven-debian-helper
 Standards-Version: 3.9.6
 Homepage: http://github.com/jruby/joni/
@@ -14,7 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jruby-joni.git
 
 Package: libjruby-joni-java
 Architecture: all
-Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm3-java
+Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm4-java (>= 5.0.3),
 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/patches/build.xml-jcoding.patch b/debian/patches/build.xml-jcoding.patch
index 5b1d2ce..f205576 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/asm3.jar" />
++                <pathelement location="/usr/share/java/asm4.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/asm3.jar" />
++                                                    /usr/share/java/asm4.jar" />
              </manifest>
          </jar>
  

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