[SCM] libbluray/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3f1fa8be03dd2745023142a3d8b35944c2f478b5
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Sep 4 17:49:39 2014 +0200

    Refresh patches

diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
index 7723ed7..a8b175c 100644
--- a/debian/patches/01_java-compat.patch
+++ b/debian/patches/01_java-compat.patch
@@ -9,7 +9,7 @@ Forwarded: no
 
 --- libbluray.orig/src/libbluray/bdj/build.xml
 +++ libbluray/src/libbluray/bdj/build.xml
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
              description="compile the source " >
          <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
                 bootclasspath="${bootclasspath}"
diff --git a/debian/patches/02_online-image.patch b/debian/patches/02_online-image.patch
index b04ef66..c319651 100644
--- a/debian/patches/02_online-image.patch
+++ b/debian/patches/02_online-image.patch
@@ -2,8 +2,8 @@ Description: Do not download image from the web.
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-02-09
 
---- a/doc/doxygen-footer.html
-+++ b/doc/doxygen-footer.html
+--- libbluray.orig/doc/doxygen-footer.html
++++ libbluray/doc/doxygen-footer.html
 @@ -5,7 +5,6 @@
      <a href="http://www.doxygen.org/index.html">
      <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.1<br />
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 bdbc6ae..7d3d962 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
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,6 +83,12 @@
+--- libbluray.orig/configure.ac
++++ libbluray/configure.ac
+@@ -83,6 +83,12 @@ AC_ARG_ENABLE([bdjava],
    [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 @@
+@@ -204,7 +210,7 @@ if [[ $use_bdjava = "yes" ]]; then
    ])
  
    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 @@
+@@ -213,6 +219,7 @@ if [[ $use_bdjava = "yes" ]]; then
    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 @@
+@@ -254,6 +261,7 @@ echo "  --------"
  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
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -133,10 +133,12 @@
+--- libbluray.orig/src/Makefile.am
++++ libbluray/src/Makefile.am
+@@ -134,10 +134,12 @@ pkginclude_HEADERS = \
  	util/log_control.h
  
  if USING_BDJAVA
@@ -61,7 +61,7 @@ Last-Update: 2014-02-09
  
  libbluray_la_SOURCES += \
  	libbluray/bdj/bdj.h \
-@@ -160,6 +162,7 @@
+@@ -161,6 +163,7 @@ libbluray_la_SOURCES += \
  
  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' \
-@@ -175,6 +178,7 @@
+@@ -176,6 +179,7 @@ clean-local:
  	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
  	    clean
  endif
diff --git a/debian/patches/04_kfreebsd-include.patch b/debian/patches/04_kfreebsd-include.patch
index 38de30e..b14fab4 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
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,6 +195,7 @@
+--- libbluray.orig/configure.ac
++++ libbluray/configure.ac
+@@ -195,6 +195,7 @@ if [[ $use_bdjava = "yes" ]]; then
         freebsd*) java_os=freebsd ;;
         solaris*) java_os=solaris ;;
         darwin*)  java_os=darwin ;;

-- 
libbluray packaging