r526 - in /packages/red5/trunk/debian: ant.properties changelog control rules

[drazzib at users.alioth.debian.org]

Author: drazzib
Date: Thu Aug 16 21:33:20 2012
New Revision: 526

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=526
Log:
* Transition package to use default java implementation (Closes: #684287):
  - 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.
* Upload to unstable.

Modified:
    packages/red5/trunk/debian/ant.properties
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/control
    packages/red5/trunk/debian/rules

Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/ant.properties?rev=526&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties (original)
+++ packages/red5/trunk/debian/ant.properties Thu Aug 16 21:33:20 2012
@@ -43,4 +43,7 @@
 /usr/share/tomcat6/lib/el-api.jar
 
 # For plugins
-red5.root = ../../
+red5.root = ../../
+
+# Specify target version for red5 - needs Java 6+
+java.target_version=1.6

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/changelog?rev=526&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog (original)
+++ packages/red5/trunk/debian/changelog Thu Aug 16 21:33:20 2012
@@ -1,3 +1,17 @@
+red5 (1.0~svn4374-2) unstable; urgency=low
+
+  [ James Page ]
+  * Transition package to use default java implementation (Closes: #684287):
+    - 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.
+
+  [ Damien Raude-Morvan ]
+  * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 16 Aug 2012 23:18:00 +0200
+
 red5 (1.0~svn4374-1) unstable; urgency=low
 
   * New upstream snapshot (r4374 in SVN):

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=526&op=diff
==============================================================================
--- packages/red5/trunk/debian/control (original)
+++ packages/red5/trunk/debian/control Thu Aug 16 21:33:20 2012
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-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,

Modified: packages/red5/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/rules?rev=526&op=diff
==============================================================================
--- packages/red5/trunk/debian/rules (original)
+++ packages/red5/trunk/debian/rules Thu Aug 16 21:33:20 2012
@@ -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