[SCM] libbluray/master: Drop 02_java7-fix-overrides.patch

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 907183474100e956465a35c1429c61a28ed3a9e4
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Sep 20 19:24:26 2013 +0200

    Drop 02_java7-fix-overrides.patch

diff --git a/debian/changelog b/debian/changelog
index 1b90f8f..7ad0d14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,6 @@ libbluray (1:0.4.0-1) UNRELEASED; urgency=low
     - Added cropping and palette update flag to BD_OVERLAY
   * debian/patches:
     - Refreshed 01_java-compat.patch and keep targeting 1.5
-    - Added 02_java7-fix-overrides.patch
   * debian/control,libbluray-bin:
     - Install /usr/bin/bd_info
     - Add explicit build-dep on pkg-config (Closes: #688578)
diff --git a/debian/patches/02_java7-fix-overrides.patch b/debian/patches/02_java7-fix-overrides.patch
deleted file mode 100644
index 01f45b6..0000000
--- a/debian/patches/02_java7-fix-overrides.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
-index 690425d..08e4fc8 100644
---- a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
-+++ b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
-@@ -105,7 +105,7 @@ class BDGraphicsConfiguration extends GraphicsConfiguration {
-     }
- 
-     /* J2SE java 6 */
--    boolean isTranslucencyCapable() {
-+    public boolean isTranslucencyCapable() {
-         return true;
-     }
- }
-diff --git a/src/libbluray/bdj/java/java/awt/BDGraphicsDevice.java b/src/libbluray/bdj/java/java/awt/BDGraphicsDevice.java
-index c236419..824f7f1 100644
---- a/src/libbluray/bdj/java/java/awt/BDGraphicsDevice.java
-+++ b/src/libbluray/bdj/java/java/awt/BDGraphicsDevice.java
-@@ -61,7 +61,7 @@ class BDGraphicsDevice extends GraphicsDevice {
-     }
- 
-     /* J2SE java 7 */
--    boolean isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency translucencyKind) {
-+    public boolean isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency translucencyKind) {
-         return true;
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9eb3eee..e769a2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_java-compat.patch
-02_java7-fix-overrides.patch

-- 
libbluray packaging