[SCM] libbluray/master: Refresh

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 022d29721306b7cf632a85aa57aa2aa55fbeca29
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jun 28 02:26:39 2014 +0200

    Refresh

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 0f81015..fe986d4 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -21,7 +21,7 @@ Last-Update: 2014-02-09
  AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
  
-@@ -199,6 +205,7 @@
+@@ -204,6 +210,7 @@
    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
  fi
  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
@@ -29,7 +29,7 @@ Last-Update: 2014-02-09
  
  dnl BD-J type
  if test "$BDJ_TYPE" = "j2me"; then
-@@ -240,6 +247,7 @@
+@@ -245,6 +252,7 @@
  echo "  BD-J support:                  $use_bdjava"
  if [[ $use_bdjava = "yes" ]]; then
  echo "  BD-J type:                     $BDJ_TYPE"
@@ -39,7 +39,7 @@ Last-Update: 2014-02-09
  fi
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -127,10 +127,12 @@
+@@ -133,10 +133,12 @@
  	util/log_control.h
  
  if USING_BDJAVA
@@ -52,7 +52,7 @@ Last-Update: 2014-02-09
  
  libbluray_la_SOURCES += \
  	libbluray/bdj/bdj.h \
-@@ -154,6 +156,7 @@
+@@ -160,6 +162,7 @@
  
  AM_CFLAGS += $(BDJAVA_CFLAGS)
  
@@ -60,7 +60,7 @@ Last-Update: 2014-02-09
  all-local:
  	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
  	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
-@@ -167,6 +170,7 @@
+@@ -175,6 +178,7 @@
  	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
  	    clean
  endif

-- 
libbluray packaging