[SCM] libbluray/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6e92baf7f0c968f7fd6f4aa841e77d2a87c278d7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 14 19:29:27 2017 +0200

    Refresh patches

diff --git a/debian/patches/02_online-image.patch b/debian/patches/02_online-image.patch
index c319651..b04ef66 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
 
---- libbluray.orig/doc/doxygen-footer.html
-+++ libbluray/doc/doxygen-footer.html
+--- a/doc/doxygen-footer.html
++++ b/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/04_kfreebsd-include.patch b/debian/patches/04_kfreebsd-include.patch
index 14c4d88..e814f00 100644
--- a/debian/patches/04_kfreebsd-include.patch
+++ b/debian/patches/04_kfreebsd-include.patch
@@ -7,11 +7,11 @@ Last-Update: 2014-06-28
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -217,6 +217,7 @@
-        freebsd*) java_os=freebsd ;;
-        solaris*) java_os=solaris ;;
-        darwin*)  java_os=darwin ;;
-+       kfreebsd*) java_os=linux ;;
-        *)        java_os=$host_os ;;
-   esac
+@@ -206,6 +206,7 @@
+      freebsd*) java_os=freebsd ;;
+      solaris*) java_os=solaris ;;
+      darwin*)  java_os=darwin ;;
++     kfreebsd*) java_os=linux ;;
+      *)        java_os=$host_os ;;
+ esac
  
diff --git a/debian/patches/06_Fix_spelling_error.patch b/debian/patches/06_Fix_spelling_error.patch
deleted file mode 100644
index 5d85556..0000000
--- a/debian/patches/06_Fix_spelling_error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Dylan Aïssi <bob.dybian at gmail.com>
-Description: Fix spelling error.
-Last-Update: 2016-10-12
-Forwarded: https://mailman.videolan.org/pipermail/libbluray-devel/2017-March/002566.html
-
---- a/src/libbluray/bdj/native/bdjo.c
-+++ b/src/libbluray/bdj/native/bdjo.c
-@@ -44,7 +44,7 @@
- #define JNICHK(a) \
-   do {                                                              \
-       if ((*env)->ExceptionOccurred(env)) {                         \
--          BD_DEBUG(DBG_BDJ | DBG_CRIT, "Exception occured\n");      \
-+          BD_DEBUG(DBG_BDJ | DBG_CRIT, "Exception occurred\n");     \
-           (*env)->ExceptionDescribe(env);                           \
-       }                                                             \
-       if (!(a)) {                                                   \
diff --git a/debian/patches/series b/debian/patches/series
index 777db75..cf767bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02_online-image.patch
 04_kfreebsd-include.patch
 05_use-system-asm.patch
-06_Fix_spelling_error.patch

-- 
libbluray packaging