[SCM] libbluray/master: Transition package to use default java implementation

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

The following commit has been merged in the master branch:
commit b0485787dac339c8ef1632158930f5782c847f55
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Wed Sep 19 09:08:14 2012 +0200

    Transition package to use default java implementation

diff --git a/debian/changelog b/debian/changelog
index 39d5cce..ffed7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libbluray (1:0.2.3-1) UNRELEASED; urgency=low
 
+  [ Rico Tzschichholz ]
   * New upstream release
     - Fixed memory leaks
     - Automatic language selection: disable subtitles when audio is in the
@@ -10,6 +11,13 @@ libbluray (1:0.2.3-1) UNRELEASED; urgency=low
     - Added disc ID and AACS MKB version to BD_DISC_INFO
     - Added extended AACS error codes
 
+  [ James Page ]
+  * Transition package to use default java implementation:
+    - d/control: BD on default-jdk for linux archs.
+    - d/rules: Use /usr/lib/jvm/default-java for JAVA_HOME.
+    - d/patches/java-compat.patch: Set source/target = 1.5 to ensure
+      that backwards compatible bytecode is built.
+
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Wed, 19 Sep 2012 08:46:53 +0200
 
 libbluray (1:0.2.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 60af830..4dc8013 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Andres Mejia <amejia at debian.org>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.1.3~),
                javahelper,
-               openjdk-6-jdk [linux-any],
+               default-jdk [linux-any],
                ant,
                libxml2-dev,
                doxygen,
diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
new file mode 100644
index 0000000..1637b15
--- /dev/null
+++ b/debian/patches/01_java-compat.patch
@@ -0,0 +1,19 @@
+Description: Ensure source/target is specified so backwards
+ compatible bytecode is generated during the build process.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+Index: libbluray-0.2.2/src/libbluray/bdj/build.xml
+===================================================================
+--- libbluray-0.2.2.orig/src/libbluray/bdj/build.xml	2010-07-19 10:54:58.000000000 +0100
++++ libbluray-0.2.2/src/libbluray/bdj/build.xml	2012-08-06 11:44:21.099044620 +0100
+@@ -15,7 +15,8 @@
+ 
+     <target name="compile" depends="init"
+             description="compile the source " >
+-        <javac srcdir="${src}" destdir="${build}" debug="yes" />
++        <javac srcdir="${src}" destdir="${build}" debug="yes"
++               source="1.5" target="1.5"/>
+     </target>
+ 
+     <target name="dist" depends="compile"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e769a2b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_java-compat.patch
diff --git a/debian/rules b/debian/rules
index 030bd9c..7b85aed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,11 @@ confflags := --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-doxygen-doc
 # enable bdjava on linux hosts only
 ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
 
-# openjdk-6_6b23~pre8-2 and later have multiarchified JAVA_HOME
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
-ifeq (,$(wildcard $(JAVA_HOME)))
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+# Use default java implementation
+JAVA_HOME=/usr/lib/jvm/default-java
 ifeq (,$(wildcard $(JAVA_HOME)))
      $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!")
 endif
-endif
 
 $(info Located java at $(JAVA_HOME))
 confflags += --enable-bdjava --with-jdk=$(JAVA_HOME)

-- 
libbluray packaging