[SCM] libbluray/master: Remove patch to control JAR build

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc9be89ce2df874378a04a91929c041ce1cd18c7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue May 17 19:31:17 2016 +0200

    Remove patch to control JAR build
    
    Included upstream.

diff --git a/debian/patches/03_split-jar-build-for-arch-all.patch b/debian/patches/03_split-jar-build-for-arch-all.patch
deleted file mode 100644
index 327c716..0000000
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Add extra argument to enable building of JAR files
- The JAR file is shipped in an Architecture: all package so only needs to be
- built once. This patch adds an extra argument to enable/disabling building of
- the JAR file seperatly from the BD-Java support.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-05-03
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -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],
-+  [enable JAR file for BD-Java support (default is no)])],
-+  [use_bdjava_jar=$enableval],
-+  [use_bdjava_jar=no])
-+
- AC_ARG_WITH([libxml2],
-   [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
- 
-@@ -224,7 +230,7 @@
-   ])
- 
-   AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
--  if test "x$HAVE_ANT" = "xno"; then
-+  if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
-       AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
-   fi
- 
-@@ -233,6 +239,7 @@
-   AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
- fi
- AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
-+AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
- 
- dnl BD-J type
- if test "$BDJ_TYPE" = "j2me"; then
-@@ -292,6 +299,7 @@
- echo "  BD-J support:                  $use_bdjava"
- if [[ $use_bdjava = "yes" ]]; then
- echo "  BD-J type:                     $BDJ_TYPE"
-+echo "  build JAR:                     $use_bdjava_jar"
- if test x"$BDJ_BOOTCLASSPATH" != x""; then
- echo "  BD-J bootclasspath:            $BDJ_BOOTCLASSPATH"
- fi
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -186,10 +186,12 @@
- 
- 
- if USING_BDJAVA
-+if USING_BDJAVA_BUILD_JAR
- jardir=$(datadir)/java/
- jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar
- 
- $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
-+endif
- 
- libbluray_la_SOURCES += \
- 	src/libbluray/bdj/bdj.h \
-@@ -214,6 +216,7 @@
- 
- AM_CFLAGS += $(BDJAVA_CFLAGS)
- 
-+if USING_BDJAVA_BUILD_JAR
- all-local:
- 	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
- 	    -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
-@@ -229,6 +232,7 @@
- 	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
- 	    clean
- endif
-+endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = src/libbluray.pc
diff --git a/debian/patches/series b/debian/patches/series
index 92f4bcc..cf767bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02_online-image.patch
-03_split-jar-build-for-arch-all.patch
 04_kfreebsd-include.patch
 05_use-system-asm.patch
diff --git a/debian/rules b/debian/rules
index 3da45c2..f9d917b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@ confflags = --with-libxml2 --with-freetype \
 	--enable-bdjava --with-bdj-type=j2se \
 	--enable-udf \
 	--disable-silent-rules
-# --enable-bdjava-jar is introduced by 03_split-jar-build-for-arch-all.patch.
-# This enables us to build the JAR file only if the Architecture: all package
-# libbluray-bdj is built.
 confflags_java = --enable-bdjava-jar
 
 # Use default java implementation

-- 
libbluray packaging