[SCM] libbluray/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5de68260047061235409fc34997fc9049982f7fe
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jan 28 01:37:22 2015 +0100

    Refresh patches

diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
index a8b175c..bb89d1c 100644
--- a/debian/patches/01_java-compat.patch
+++ b/debian/patches/01_java-compat.patch
@@ -7,14 +7,14 @@ Forwarded: no
  src/libbluray/bdj/build.xml |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- libbluray.orig/src/libbluray/bdj/build.xml
-+++ libbluray/src/libbluray/bdj/build.xml
+--- a/src/libbluray/bdj/build.xml
++++ b/src/libbluray/bdj/build.xml
 @@ -20,7 +20,7 @@
              description="compile the source " >
          <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" >
+-               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/03_split-jar-build-for-arch-all.patch b/debian/patches/03_split-jar-build-for-arch-all.patch
index 7d3d962..2270d0d 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -6,9 +6,9 @@ Author: Sebastian Ramacher <sramacher at debian.org>
 Forwarded: not-needed
 Last-Update: 2014-02-09
 
---- libbluray.orig/configure.ac
-+++ libbluray/configure.ac
-@@ -83,6 +83,12 @@ AC_ARG_ENABLE([bdjava],
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,6 +83,12 @@
    [use_bdjava=$enableval],
    [use_bdjava=no])
  
@@ -21,7 +21,7 @@ Last-Update: 2014-02-09
  AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
  
-@@ -204,7 +210,7 @@ if [[ $use_bdjava = "yes" ]]; then
+@@ -218,7 +224,7 @@
    ])
  
    AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
@@ -30,7 +30,7 @@ Last-Update: 2014-02-09
        AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
    fi
  
-@@ -213,6 +219,7 @@ if [[ $use_bdjava = "yes" ]]; then
+@@ -227,6 +233,7 @@
    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
  fi
  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
@@ -38,7 +38,7 @@ Last-Update: 2014-02-09
  
  dnl BD-J type
  if test "$BDJ_TYPE" = "j2me"; then
-@@ -254,6 +261,7 @@ echo "  --------"
+@@ -268,6 +275,7 @@
  echo "  BD-J support:                  $use_bdjava"
  if [[ $use_bdjava = "yes" ]]; then
  echo "  BD-J type:                     $BDJ_TYPE"
@@ -46,9 +46,9 @@ Last-Update: 2014-02-09
  if test x"$BDJ_BOOTCLASSPATH" != x""; then
  echo "  BD-J bootclasspath:            $BDJ_BOOTCLASSPATH"
  fi
---- libbluray.orig/src/Makefile.am
-+++ libbluray/src/Makefile.am
-@@ -134,10 +134,12 @@ pkginclude_HEADERS = \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -138,10 +138,12 @@
  	util/log_control.h
  
  if USING_BDJAVA
@@ -61,7 +61,7 @@ Last-Update: 2014-02-09
  
  libbluray_la_SOURCES += \
  	libbluray/bdj/bdj.h \
-@@ -161,6 +163,7 @@ libbluray_la_SOURCES += \
+@@ -166,6 +168,7 @@
  
  AM_CFLAGS += $(BDJAVA_CFLAGS)
  
@@ -69,7 +69,7 @@ Last-Update: 2014-02-09
  all-local:
  	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
  	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
-@@ -176,6 +179,7 @@ clean-local:
+@@ -181,6 +184,7 @@
  	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
  	    clean
  endif
diff --git a/debian/patches/04_kfreebsd-include.patch b/debian/patches/04_kfreebsd-include.patch
index b14fab4..03c01ad 100644
--- a/debian/patches/04_kfreebsd-include.patch
+++ b/debian/patches/04_kfreebsd-include.patch
@@ -5,9 +5,9 @@ Author: Sebastian Ramacher <sramacher at debian.org>
 Bug-Debian: http://bugs.debian.org/751433
 Last-Update: 2014-06-28
 
---- libbluray.orig/configure.ac
-+++ libbluray/configure.ac
-@@ -195,6 +195,7 @@ if [[ $use_bdjava = "yes" ]]; then
+--- a/configure.ac
++++ b/configure.ac
+@@ -209,6 +209,7 @@
         freebsd*) java_os=freebsd ;;
         solaris*) java_os=solaris ;;
         darwin*)  java_os=darwin ;;

-- 
libbluray packaging