[SCM] libbluray/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bb1f612568cb7a59c074f67160d8dfdc0ed1a352
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 3 01:22:47 2015 +0200

    Refresh patches

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 2270d0d..89f5312 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -4,13 +4,13 @@ Description: Add extra argument to enable building of JAR files
  the JAR file seperatly from the BD-Java support.
 Author: Sebastian Ramacher <sramacher at debian.org>
 Forwarded: not-needed
-Last-Update: 2014-02-09
+Last-Update: 2015-05-03
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -83,6 +83,12 @@
-   [use_bdjava=$enableval],
-   [use_bdjava=no])
+@@ -89,6 +89,12 @@
+ AC_ARG_ENABLE([udf],
+   [AS_HELP_STRING([--enable-udf], [enable UDF support @<:@default=disabled@:>@])])
  
 +AC_ARG_ENABLE([bdjava-jar],
 +  [AS_HELP_STRING([--enable-bdjava-jar],
@@ -21,7 +21,7 @@ Last-Update: 2014-02-09
  AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
  
-@@ -218,7 +224,7 @@
+@@ -224,7 +230,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
  
-@@ -227,6 +233,7 @@
+@@ -233,6 +239,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
-@@ -268,6 +275,7 @@
+@@ -292,6 +299,7 @@
  echo "  BD-J support:                  $use_bdjava"
  if [[ $use_bdjava = "yes" ]]; then
  echo "  BD-J type:                     $BDJ_TYPE"
@@ -46,34 +46,34 @@ 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
-@@ -138,10 +138,12 @@
- 	util/log_control.h
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -185,10 +185,12 @@
+ 
  
  if USING_BDJAVA
 +if USING_BDJAVA_BUILD_JAR
  jardir=$(datadir)/java/
- jar_DATA=$(top_builddir)/src/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar
+ jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar
  
- $(top_builddir)/src/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
+ $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
 +endif
  
  libbluray_la_SOURCES += \
- 	libbluray/bdj/bdj.h \
-@@ -166,6 +168,7 @@
+ 	src/libbluray/bdj/bdj.h \
+@@ -213,6 +215,7 @@
  
  AM_CFLAGS += $(BDJAVA_CFLAGS)
  
 +if USING_BDJAVA_BUILD_JAR
  all-local:
  	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
- 	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
-@@ -181,6 +184,7 @@
+ 	    -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
+@@ -228,6 +231,7 @@
  	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
  	    clean
  endif
 +endif
  
  pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libbluray.pc
+ pkgconfig_DATA = src/libbluray.pc
diff --git a/debian/patches/04_kfreebsd-include.patch b/debian/patches/04_kfreebsd-include.patch
index 03c01ad..ac11f8f 100644
--- a/debian/patches/04_kfreebsd-include.patch
+++ b/debian/patches/04_kfreebsd-include.patch
@@ -7,7 +7,7 @@ Last-Update: 2014-06-28
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -209,6 +209,7 @@
+@@ -215,6 +215,7 @@
         freebsd*) java_os=freebsd ;;
         solaris*) java_os=solaris ;;
         darwin*)  java_os=darwin ;;

-- 
libbluray packaging