[SCM] libbluray/master: Update to use libasm-java

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2b3206d9ca0e0fe2cb3754a98f80428b7465fbc
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 14 20:21:07 2017 +0200

    Update to use libasm-java
    
    Closes: #839720

diff --git a/debian/control b/debian/control
index 44b61d2..3a601f4 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends-Indep: ant,
                      texlive-latex-extra,
                      latex-xcolor,
                      texlive-fonts-recommended,
-                     libasm4-java
+                     libasm-java
 Standards-Version: 3.9.8
 Homepage: http://www.videolan.org/developers/libbluray.html
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libbluray.git
diff --git a/debian/patches/05_use-system-asm.patch b/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
similarity index 84%
rename from debian/patches/05_use-system-asm.patch
rename to debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
index cd129d3..d703b34 100644
--- a/debian/patches/05_use-system-asm.patch
+++ b/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
@@ -1,13 +1,13 @@
-From: "sramacher at debian.org" <sramacher at debian.org>
-Date: Wed, 14 Jun 2017 19:32:24 +0200
-Subject: Use system asm4 instead of embedded copy
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Wed, 14 Jun 2017 20:22:27 +0200
+Subject: Use system asm instead of embedded copy
 
 ---
  src/libbluray/bdj/build.xml | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml
-index 938cd44..7404699 100644
+index 938cd44..1b5b0e6 100644
 --- a/src/libbluray/bdj/build.xml
 +++ b/src/libbluray/bdj/build.xml
 @@ -19,22 +19,23 @@
@@ -26,7 +26,7 @@ index 938cd44..7404699 100644
                 <compilerarg value="-XDignore.symbol.file"/>
                 <compilerarg value="-Xlint:-deprecation"/>
 +               <classpath>
-+                   <pathelement path="/usr/share/java/asm4.jar" />
++                   <pathelement path="/usr/share/java/asm.jar" />
 +               </classpath>
          </javac>
      </target>
@@ -35,7 +35,7 @@ index 938cd44..7404699 100644
 -        <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}" />
 +            <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}">
 +                <manifest>
-+                    <attribute name="Class-Path" value="/usr/share/java/asm4.jar" />
++                    <attribute name="Class-Path" value="/usr/share/java/asm.jar" />
 +                </manifest>
 +            </jar>
      </target>
diff --git a/debian/patches/series b/debian/patches/series
index cf767bf..583a67e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 02_online-image.patch
 04_kfreebsd-include.patch
-05_use-system-asm.patch
+0003-Use-system-asm-instead-of-embedded-copy.patch

-- 
libbluray packaging