[SCM] libbluray/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 97ffd8628ed1aa383ac50bb6a827f52464647fc3
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 3 23:46:08 2017 +0100

    Refresh patches

diff --git a/debian/patches/02_online-image.patch b/debian/patches/0001-Do-not-download-image-from-the-web.patch
similarity index 100%
rename from debian/patches/02_online-image.patch
rename to debian/patches/0001-Do-not-download-image-from-the-web.patch
diff --git a/debian/patches/04_kfreebsd-include.patch b/debian/patches/0002-Work-around-751532.patch
similarity index 88%
rename from debian/patches/04_kfreebsd-include.patch
rename to debian/patches/0002-Work-around-751532.patch
index 9b58aa1..e61256a 100644
--- a/debian/patches/04_kfreebsd-include.patch
+++ b/debian/patches/0002-Work-around-751532.patch
@@ -9,10 +9,10 @@ accordingly.
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index 98a5226..b080d35 100644
+index 5fd3c8d..3bb5d14 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -206,6 +206,7 @@ case $host_os in
+@@ -209,6 +209,7 @@ case $host_os in
       freebsd*) java_os=freebsd ;;
       solaris*) java_os=solaris ;;
       darwin*)  java_os=darwin ;;
diff --git a/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch b/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
index d703b34..cf71ed2 100644
--- a/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
+++ b/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch
@@ -3,14 +3,14 @@ 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(-)
+ src/libbluray/bdj/build.xml | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml
-index 938cd44..1b5b0e6 100644
+index 938cd44..2db7825 100644
 --- a/src/libbluray/bdj/build.xml
 +++ b/src/libbluray/bdj/build.xml
-@@ -19,22 +19,23 @@
+@@ -19,22 +19,25 @@
  
      <target name="compile" depends="init"
              description="compile the source " >
@@ -27,6 +27,7 @@ index 938cd44..1b5b0e6 100644
                 <compilerarg value="-Xlint:-deprecation"/>
 +               <classpath>
 +                   <pathelement path="/usr/share/java/asm.jar" />
++                   <pathelement path="/usr/share/java/asm-commons.jar" />
 +               </classpath>
          </javac>
      </target>
@@ -36,6 +37,7 @@ index 938cd44..1b5b0e6 100644
 +            <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}">
 +                <manifest>
 +                    <attribute name="Class-Path" value="/usr/share/java/asm.jar" />
++                    <attribute name="Class-Path" value="/usr/share/java/asm-commons.jar" />
 +                </manifest>
 +            </jar>
      </target>
diff --git a/debian/patches/series b/debian/patches/series
index 583a67e..ef63eca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-02_online-image.patch
-04_kfreebsd-include.patch
+0001-Do-not-download-image-from-the-web.patch
+0002-Work-around-751532.patch
 0003-Use-system-asm-instead-of-embedded-copy.patch

-- 
libbluray packaging