r520 - in /packages/red5/trunk/debian: changelog control red5-server.default red5-server.init red5-server.links

Wed Sep 28 17:40:24 UTC 2011

Author: drazzib
Date: Wed Sep 28 17:40:24 2011
New Revision: 520

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=520
Log:
  - d/control: Depends on libxml-commons-external-java.
* Use default-java for now (since multi-arch enabled openjdk-6/7 are easy
  to use inside init.d).

Modified:
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/control
    packages/red5/trunk/debian/red5-server.default
    packages/red5/trunk/debian/red5-server.init
    packages/red5/trunk/debian/red5-server.links

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/changelog?rev=520&op=diff
==============================================================================

--- packages/red5/trunk/debian/changelog (original)
+++ packages/red5/trunk/debian/changelog Wed Sep 28 17:40:24 2011
@@ -1,20 +1,21 @@
-red5 (1.0~svn4279-1) UNRELEASED; urgency=low
-
-  TODO: Find a way to handle multi-arch openjdk in init.d.
+red5 (1.0~svn4279-1) unstable; urgency=low
 
   * New upstream snapshot (r4279 in SVN):
     - d/patches/13_jaudiotagger2.diff: Droped, merged upstream.
     - d/control: Replace libcommons-httpclient-java by libhttpcore-java
       and libhttpclient-java.
     - d/control: Replace libcommons-lang-java by libcommons-lang3-java.
+    - d/control: Depends on libxml-commons-external-java.
   * d/control: Bump Standards-Version to 3.9.2: no changes needed.
   * d/control: Depends on librhino-java instead of rhino.
   * d/README.Debian: Add information about webapp.virtualHosts and
     remove warning about spring 2.5.
   * d/ant.properties: Use quartz.jar instead of old quartz-all.jar.
   * d/rules: Handle multi-arch openjdk during build. (Closes: #642275).
+  * Use default-java for now (since multi-arch enabled openjdk-6/7 are easy
+    to use inside init.d).
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 21 Sep 2011 21:24:39 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 28 Sep 2011 18:25:03 +0200
 
 red5 (1.0~svn4198-2) unstable; urgency=low
 

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=520&op=diff
==============================================================================
--- packages/red5/trunk/debian/control (original)
+++ packages/red5/trunk/debian/control Wed Sep 28 17:40:24 2011
@@ -30,7 +30,7 @@
  libjaudiotagger-java, libxmlrpc3-server-java, glassfish-javaee,
  libantlr-java, libasm3-java, libcommons-codec-java, libcommons-modeler-java,
  libcommons-logging-java, libcommons-pool-java, jython,
- libspring-context-support-java, libstax-java
+ libspring-context-support-java, libstax-java, libxml-commons-external-java
 Description: remote API for Red5 flash streaming server
  Red5 is a Java implementation of a Flash Media Server based on
  reverse engineering of RTMP and AMF protocols.
@@ -43,7 +43,7 @@
 
 Package: red5-server
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless,
+Depends: ${misc:Depends}, default-jre-headless (>= 1:1.6) | java6-runtime-headless,
  adduser (>= 3.11), libred5-java (= ${source:Version}),
  libtomcat6-java (>= 6.0.20-7)
 Conflicts: red5

Modified: packages/red5/trunk/debian/red5-server.default
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.default?rev=520&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.default (original)
+++ packages/red5/trunk/debian/red5-server.default Wed Sep 28 17:40:24 2011
@@ -13,7 +13,7 @@
 
 # JVM to use to start Red5 (use OpenJDK6 by default)
 # If you leave it blank, will use alternative system (ie. /usr/bin/java symlink)
-#JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+#JAVA_HOME=/usr/lib/jvm/default-java/
 
 # JVM options for startup
 #JAVA_OPTS=

Modified: packages/red5/trunk/debian/red5-server.init
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.init?rev=520&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.init (original)
+++ packages/red5/trunk/debian/red5-server.init Wed Sep 28 17:40:24 2011
@@ -58,7 +58,7 @@
 DAEMONUSER=_red5
 
 # JVM to use to start Red5
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+JAVA_HOME=/usr/lib/jvm/default-java/
 
 # JVM options for startup
 JAVA_OPTS=

Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.links?rev=520&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links (original)
+++ packages/red5/trunk/debian/red5-server.links Wed Sep 28 17:40:24 2011
@@ -47,6 +47,7 @@
 /usr/share/java/quartz.jar usr/share/red5/lib/quartz.jar
 /usr/share/java/xmlrpc-server-3.1.jar usr/share/red5/lib/xmlrpc-server.jar
 /usr/share/java/xmlrpc-common-3.1.jar usr/share/red5/lib/xmlrpc-common.jar
+/usr/share/java/jaxp-1.4.jar usr/share/red5/lib/jaxp-1.4.jar
 
 
 # Dependencies for Tomcat Plugin


