[SCM] libbluray/master: Drop 01_java-compat.patch and refresh 05_use-system-asm.patch

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Dec 2 12:38:53 UTC 2015


The following commit has been merged in the master branch:
commit 32e88257c0831a5b69bac212cb5813d28ef715cf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Dec 2 13:38:08 2015 +0100

    Drop 01_java-compat.patch and refresh 05_use-system-asm.patch
    
    This patch was only required pre 0.2.2.

diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
deleted file mode 100644
index 104b999..0000000
--- a/debian/patches/01_java-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Ensure source/target is specified so backwards
- compatible bytecode is generated during the build process.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: no
-
----
- src/libbluray/bdj/build.xml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/libbluray/bdj/build.xml
-+++ b/src/libbluray/bdj/build.xml
-@@ -27,7 +27,7 @@
-         </javac>
-         <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
-                bootclasspath="${bootclasspath}"
--               source="1.4" target="1.4">
-+               source="1.5" target="1.5">
-                <compilerarg value="-XDignore.symbol.file"/>
-                <compilerarg value="-Xlint:-deprecation"/>
-         </javac>
diff --git a/debian/patches/05_use-system-asm.patch b/debian/patches/05_use-system-asm.patch
index 7d27be2..5ca202e 100644
--- a/debian/patches/05_use-system-asm.patch
+++ b/debian/patches/05_use-system-asm.patch
@@ -16,7 +16,7 @@ Last-Update: 2015-11-04
 -        </javac>
          <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
                 bootclasspath="${bootclasspath}"
-                source="1.5" target="1.5">
+                source="1.4" target="1.4">
                 <compilerarg value="-XDignore.symbol.file"/>
                 <compilerarg value="-Xlint:-deprecation"/>
 +               <classpath>
@@ -31,7 +31,7 @@ Last-Update: 2015-11-04
 +                <manifest>
 +                    <attribute name="Class-Path" value="/usr/share/java/asm4.jar" />
 +                </manifest>
-+        </jar>
++            </jar>
      </target>
  
      <target name="clean"
diff --git a/debian/patches/series b/debian/patches/series
index 584863c..92f4bcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_java-compat.patch
 02_online-image.patch
 03_split-jar-build-for-arch-all.patch
 04_kfreebsd-include.patch

-- 
libbluray packaging



More information about the pkg-multimedia-commits mailing list