Package: red5
Version: 1.0~svn4374-1
Severity: normal
Tags: patch
User: [email protected]
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 (>= 1:1.6) instead of openjdk-6-jdk.
- d/rules: Set JAVA_HOME to /usr/lib/jvm/default-java.
- d/ant.properties: Set source/target = 1.6 to ensure Java6+7
compatible bytecode is built.
Ubuntu quantal is currently transitioning from openjdk-6 to openjdk-7 as the
default java implementation; this patch eases the transtion and ensures that
Java 6+ bytecode is built by this package.
Note that this transition is not a release goal for wheezy.
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)
iQIcBAEBCAAGBQJQImYkAAoJEL/srsug59jD0l4P/Aju+6C49a+rExtnW5usCBn9
2tXmFmlUjUJayPwbZk482Qm7qNaSZSot3FFWbmzcR56whw9S58MoOD1sJQZ+weiB
kHd14OnXTe8M27/TFUs7B6Ah3gDPHbywRn+rxduUrw1BX+Y4qol44MOs+BO8BPTh
wLs/IR3SuJz0SPgxw0anBCNloZ782LGcwja6ste+OLyZUXnWrxMuqAbG+6wx6mO3
YeUWtV/sTh9CXkfGZaeK2xrk3wXcz+lEfYCI+lzSFDnBtw9Dlecf/BaqkMR+tnOj
Mj7nMg43EoXOyDlOXfjoX0hBLtX+AMbB8WkYni/Lrr7PDMODJXY+0jLIejtyvfqV
ABwsaEQovlnIbnRT7wltH6t5qKIoaW43SvpKb8B9ahURNHXCklXhvJ7D774JwCKw
TGnQ4NlEtWp9d5eG2zE/A5tWaoHLdt/xm1LPFRAxsmIWo71bFggmDNfUeajOMlpz
THs0QdpbXUxYUeJu7X3taoxmNJdxF/TPuXIMSM8cOVN179m5TTFaD4h63ICdaNVp
qWyfXA0BT6eATYN7Q7ivTcVoZeEdqT6aFZQfpHr4PY5T99Y1YKDuFxnRiB1xg5db
s+BH3NokRI18JzfyE24j1U0c28V9hdjEbU1QW/yo6emXWV1yv0Ey13/N2y5KYSiQ
4TY1aNH1bkaAgv8Rocoo
=7f9F
-----END PGP SIGNATURE-----
diff -Nru red5-1.0~svn4374/debian/ant.properties red5-1.0~svn4374/debian/ant.properties
--- red5-1.0~svn4374/debian/ant.properties 2011-09-21 20:25:11.000000000 +0100
+++ red5-1.0~svn4374/debian/ant.properties 2012-08-08 14:07:45.000000000 +0100
@@ -43,4 +43,7 @@
/usr/share/tomcat6/lib/el-api.jar
# For plugins
-red5.root = ../../
\ No newline at end of file
+red5.root = ../../
+
+# Specify target version for red5 - needs Java 6+
+java.target_version=1.6
diff -Nru red5-1.0~svn4374/debian/changelog red5-1.0~svn4374/debian/changelog
diff -Nru red5-1.0~svn4374/debian/control red5-1.0~svn4374/debian/control
--- red5-1.0~svn4374/debian/control 2012-05-27 22:42:11.000000000 +0100
+++ red5-1.0~svn4374/debian/control 2012-08-08 14:11:55.000000000 +0100
@@ -2,7 +2,7 @@
Section: java
Priority: optional
Maintainer: Damien Raude-Morvan <[email protected]>
-Build-Depends: ant, cdbs, debhelper (>= 7), openjdk-6-jdk
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk (>= 1:1.6)
Build-Depends-Indep: ant-optional,
default-jdk-doc,
docbook-xsl,
diff -Nru red5-1.0~svn4374/debian/rules red5-1.0~svn4374/debian/rules
--- red5-1.0~svn4374/debian/rules 2011-09-21 20:25:11.000000000 +0100
+++ red5-1.0~svn4374/debian/rules 2012-08-08 13:53:29.000000000 +0100
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := debian/build.xml
# Build classpath is set via ant.properties
