[SCM] libbluray/master: Refresh 01_java-compat.patch

ricotz-guest at users.alioth.debian.org ricotz-guest at users.alioth.debian.org
Sat May 11 09:19:53 UTC 2013


The following commit has been merged in the master branch:
commit dec392592b5ff569301543d88fc7f052b9c1f5a8
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sat May 11 09:36:37 2013 +0200

    Refresh 01_java-compat.patch

diff --git a/debian/changelog b/debian/changelog
index 78272ff..912621a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ libbluray (1:0.3.0-1) UNRELEASED; urgency=low
     - Added 3D extension data to raw clip info
     - added 3D player settings
     - Added cropping and palette update flag to BD_OVERLAY
+  * debian/patches/01_java-compat.patch:
+    - Refreshed and keep targetting 1.5
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 11 May 2013 08:57:25 +0200
 
diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
index 1637b15..2b46d78 100644
--- a/debian/patches/01_java-compat.patch
+++ b/debian/patches/01_java-compat.patch
@@ -7,13 +7,12 @@ Index: libbluray-0.2.2/src/libbluray/bdj/build.xml
 ===================================================================
 --- libbluray-0.2.2.orig/src/libbluray/bdj/build.xml	2010-07-19 10:54:58.000000000 +0100
 +++ libbluray-0.2.2/src/libbluray/bdj/build.xml	2012-08-06 11:44:21.099044620 +0100
-@@ -15,7 +15,8 @@
- 
-     <target name="compile" depends="init"
+@@ -15,7 +15,7 @@
              description="compile the source " >
--        <javac srcdir="${src}" destdir="${build}" debug="yes" />
-+        <javac srcdir="${src}" destdir="${build}" debug="yes"
-+               source="1.5" target="1.5"/>
+         <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
+                bootclasspath="${bootclasspath}"
+-               source="1.4" target="1.4" />
++               source="1.5" target="1.5" />
      </target>
- 
      <target name="dist" depends="compile"
+             description="generate the distribution" >

-- 
libbluray packaging



More information about the pkg-multimedia-commits mailing list