Package: libbluray
Version: 1:0.2.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* 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.
Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition and ensures that the code built by the package is backwards
compatible with java 1.5+. Note that this transition is not a wheezy release
goal.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQH6GTAAoJEL/srsug59jDttIP/2Rypn61odZo0MAn3GKqEB20
9ATucGIteH0zBnUrq9qDVmeNET4Hi9y2dEOFEMhCjTpex8D90FdJtSUpFDsCRao0
VAc2eCJ3LPnwMwMgeSnm5vwGip2laB3p+a1v9MwtZR1u0zJPoPygqCLmXkxcnnHF
ZVJlYZjkzhCDDIIvCmlIOiQQpdx5A8rF1aAc/aUEtm9QrWTkWPOnif0eJjakuuXe
kgOREhMsZxdOxoOrpVJUEinQR8L1wNYsZqytimxJ6EGLU6Pp8gOV3xte4/H72jwr
WT3o7diNHuTiR7TFyfweiuM6W0QMF7BJ7dzB2j+yAnM0mNBylzUvT/YSErjS5lUy
RDLcmgQNfl0jNbG6+GYkkftY/fXwUdPlRd6GIuyb4MvHI7ShitjAQJMyTGZd4ZVC
bD+mc9TXHTbg/GfCBn8cdgLzeNrovsmg9JF/J2DZ8M5vvmituIBWGo88/dgzVtdA
SJfSwGbQnAxUsnMeQH/lXogb4GqfvWRvz5IytjkkLK+KkzRfr/2nA/vAjfGZPWfi
emWw8jmzXPy0sQz/tRacRq45R3Uib2NmwH3B6+nsGEx1nwarD+1wq+oNeoacxHRZ
7nWgfaRUDFpbbfIheu6hEKDHMLVNXnvkxrBS3ab1kWBCQLPXV8gCyCAndAo83nf9
uG/sS8pDJJHjya2GBmuu
=Pw8h
-----END PGP SIGNATURE-----
diff -Nru libbluray-0.2.2/debian/changelog libbluray-0.2.2/debian/changelog
diff -Nru libbluray-0.2.2/debian/control libbluray-0.2.2/debian/control
--- libbluray-0.2.2/debian/control 2012-03-16 21:53:42.000000000 +0000
+++ libbluray-0.2.2/debian/control 2012-08-06 11:49:05.000000000 +0100
@@ -9,7 +9,7 @@
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 -Nru libbluray-0.2.2/debian/patches/java-compat.patch libbluray-0.2.2/debian/patches/java-compat.patch
--- libbluray-0.2.2/debian/patches/java-compat.patch 1970-01-01 01:00:00.000000000 +0100
+++ libbluray-0.2.2/debian/patches/java-compat.patch 2012-08-06 11:44:59.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Ensure source/target is specified so backwards
+ compatible bytecode is generated during the build process.
+Author: James Page <james.p...@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 -Nru libbluray-0.2.2/debian/patches/series libbluray-0.2.2/debian/patches/series
--- libbluray-0.2.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libbluray-0.2.2/debian/patches/series 2012-08-06 11:43:52.000000000 +0100
@@ -0,0 +1 @@
+java-compat.patch
diff -Nru libbluray-0.2.2/debian/rules libbluray-0.2.2/debian/rules
--- libbluray-0.2.2/debian/rules 2012-03-19 14:03:07.000000000 +0000
+++ libbluray-0.2.2/debian/rules 2012-08-06 11:38:20.000000000 +0100
@@ -9,14 +9,11 @@
# 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)
