[pkg-java] r12713 - in trunk/red5/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jun 30 22:43:07 UTC 2010
Author: drazzib
Date: 2010-06-30 22:43:06 +0000 (Wed, 30 Jun 2010)
New Revision: 12713
Added:
trunk/red5/debian/patches/14_document_removed_stuff.diff
trunk/red5/debian/red5-server.README.Debian
Removed:
trunk/red5/debian/README.Debian
Modified:
trunk/red5/debian/changelog
trunk/red5/debian/control
trunk/red5/debian/orig-tar.exclude
trunk/red5/debian/patches/series
trunk/red5/debian/red5-server.default
trunk/red5/debian/red5-server.init
trunk/red5/debian/red5-server.install
Log:
* /etc/init.d/red5-server:
- set NAME before using it for /etc/default/$NAME (Closes: #585530)
- export JAVA_HOME, JAVA_OPTS, RED5_HOME and RED5_OPTS for red5.sh usage
* Bump Standards-Version to 3.9.0: no changes needed.
* d/red5-server.install: Also install red5 logo to root webapp
* d/README.Debian:
- Describe how to install demos applications (Closes: #585946).
- Install it in red5-server package.
* d/orig-tar.exclude: Document removed stuffs
Deleted: trunk/red5/debian/README.Debian
===================================================================
--- trunk/red5/debian/README.Debian 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/README.Debian 2010-06-30 22:43:06 UTC (rev 12713)
@@ -1,43 +0,0 @@
-Red5 for Debian
-===============
-
-NOTE: Red5 in Debian doesn't use spring framework 3.0 (as red5's upstream authors)
-as this version is not yet available as Debian package.
-As replacement, we use spring framework 2.5.x.
-Please be aware if this change when you use some custom webapps (especially regarding
-XML Schema declaration in applicationContext.xml files).
-
-Packaging
----------
-Red5 debian package is divided into:
-- libred5-java: contains jar which can be used to embed Red5
-- red5-doc: contains Javadoc API and other documentations about Red5
-- red5-server: contains configuration and init script for Red5
-
-Directories
------------
-This debian package installs red5 into /usr/share/red5/
-The configuration of the server is in /etc/red5/
-Webapps can be deployed by placing them in /var/lib/red5/webapps/
-(linked from /usr/share/red5/webapps)
-Logs can be found in /var/log/red5/
-
-Documentation
--------------
-- Javadoc API is in /usr/share/doc/red5/api/index.html
-- Red5 Reference Manual is in /usr/share/doc/red5/html/index.html
-
-Startup
--------
-You can customize Red5 startup parameters by editing /etc/default/red5-server file.
-For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs.
-
-Ports
------
-By default, Red5 open the following ports :
-- 5080 (HTTP port - embedded Tomcat)
-- 1935 (RTMP port)
-- 8443 (RTMPS port)
-- 9980 (JMX port - admin and shutdown)
-
-You can edit port mapping in /etc/red5/red5.properties
Modified: trunk/red5/debian/changelog
===================================================================
--- trunk/red5/debian/changelog 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/changelog 2010-06-30 22:43:06 UTC (rev 12713)
@@ -1,3 +1,17 @@
+red5 (0.9.1-2) unstable; urgency=low
+
+ * /etc/init.d/red5-server:
+ - set NAME before using it for /etc/default/$NAME (Closes: #585530)
+ - export JAVA_HOME, JAVA_OPTS, RED5_HOME and RED5_OPTS for red5.sh usage
+ * Bump Standards-Version to 3.9.0: no changes needed.
+ * d/red5-server.install: Also install red5 logo to root webapp
+ * d/README.Debian:
+ - Describe how to install demos applications (Closes: #585946).
+ - Install it in red5-server package.
+ * d/orig-tar.exclude: Document removed stuffs
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 01 Jul 2010 00:42:55 +0200
+
red5 (0.9.1-1) unstable; urgency=low
* New upstream release (Closes: #576355):
Modified: trunk/red5/debian/control
===================================================================
--- trunk/red5/debian/control 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/control 2010-06-30 22:43:06 UTC (rev 12713)
@@ -16,7 +16,7 @@
libbackport-util-concurrent-java,
default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
Build-Conflicts: liblogback-java (= 0.9.20-1)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
Homepage: http://www.red5.org/
Modified: trunk/red5/debian/orig-tar.exclude
===================================================================
--- trunk/red5/debian/orig-tar.exclude 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/orig-tar.exclude 2010-06-30 22:43:06 UTC (rev 12713)
@@ -1,8 +1,13 @@
+# Binary files
lib
+# Generated files
+doc/reference/pdf/*
+src/conf/PolicyFileSocket.xsd
+# Contains non-DFSG binary files
+# *.swf binary-only (Flash Player) files
+# *.flv movies trailers
webapps/root/demos/*
webapps/installer/*
-doc/reference/pdf/*
-src/conf/PolicyFileSocket.xsd
*.psd
test/www/streams/*
test/fixtures/*
Added: trunk/red5/debian/patches/14_document_removed_stuff.diff
===================================================================
--- trunk/red5/debian/patches/14_document_removed_stuff.diff (rev 0)
+++ trunk/red5/debian/patches/14_document_removed_stuff.diff 2010-06-30 22:43:06 UTC (rev 12713)
@@ -0,0 +1,15 @@
+Description: Describe removed /demos and /installer webapp
+ in index.html
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Last-Update: 2010-07-01
+--- a/webapps/root/index.html
++++ b/webapps/root/index.html
+@@ -92,6 +92,7 @@
+ <br />
+ If you prefer to jump right in, follow these steps:
+ <ul>
++<li>Follow instructions in "Demos" section of <a href="file:///usr/share/doc/red5-server/README.Debian">/usr/share/doc/red5-server/README.Debian</a> to install /demos or /installer webapp.</li>
+ <li><a href="installer" target="_blank">Install</a> a ready-made application</li>
+ <li>Launch a <a href="demos">demo</a></li>
+ </ul>
Modified: trunk/red5/debian/patches/series
===================================================================
--- trunk/red5/debian/patches/series 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/patches/series 2010-06-30 22:43:06 UTC (rev 12713)
@@ -6,3 +6,4 @@
11_change_jmx_port.diff
12_javadoc_links.diff
13_jaudiotagger2.diff
+14_document_removed_stuff.diff
Copied: trunk/red5/debian/red5-server.README.Debian (from rev 12708, trunk/red5/debian/README.Debian)
===================================================================
--- trunk/red5/debian/red5-server.README.Debian (rev 0)
+++ trunk/red5/debian/red5-server.README.Debian 2010-06-30 22:43:06 UTC (rev 12713)
@@ -0,0 +1,64 @@
+Red5 for Debian
+===============
+
+NOTE: Red5 in Debian doesn't use spring framework 3.0 (as red5's upstream authors)
+as this version is not yet available as Debian package.
+As replacement, we use spring framework 2.5.x.
+Please be aware if this change when you use some custom webapps (especially regarding
+XML Schema declaration in applicationContext.xml files).
+
+Packaging
+---------
+Red5 debian package is divided into:
+- libred5-java: contains jar which can be used to embed Red5
+- red5-doc: contains Javadoc API and other documentations about Red5
+- red5-server: contains configuration and init script for Red5
+
+Directories
+-----------
+This debian package installs red5 into /usr/share/red5/
+The configuration of the server is in /etc/red5/
+Webapps can be deployed by placing them in /var/lib/red5/webapps/
+(linked from /usr/share/red5/webapps)
+Logs can be found in /var/log/red5/
+
+Documentation
+-------------
+- Javadoc API is in /usr/share/doc/red5/api/index.html
+- Red5 Reference Manual is in /usr/share/doc/red5/html/index.html
+
+Startup
+-------
+You can customize Red5 startup parameters by editing /etc/default/red5-server file.
+For example, you can set JAVA_OPTS=-Xmx512m for applications with extended memory needs.
+
+Ports
+-----
+By default, Red5 open the following ports :
+- 5080 (HTTP port - embedded Tomcat)
+- 1935 (RTMP port)
+- 8443 (RTMPS port)
+- 9980 (JMX port - admin and shutdown)
+
+You can edit port mapping in /etc/red5/red5.properties
+
+Demos
+-----
+Current red5-server package doesn't contains /demos or /installer webapps.
+They contains non-free stuffs :
+- *.swf binary-only (Flash Player) files
+- *.flv movies trailers like Avatar / Toy Story 3
+
+As root, you can install /demos (SWF files) and /installer webapp, by issuing :
+ wget http://www.red5.org/downloads/0_9/red5-0.9.1.tar.gz
+ tar xvzf red5-*.tar.gz
+ cd red5-*
+ cp -R webapps/root/demos/* /var/lib/red5/webapps/root/demos/*
+ cp -R webapps/installer/* /var/lib/red5/webapps/installer/*
+ find /var/lib/red5/webapps/ -type d -exec chown _red5 {} \;
+ cd ..
+ rm -rf red5-*
+
+Then, you can point your favorite browser to
+<http://127.0.0.1:5080/installer/>
+and install demos of your choice (Java application's parts).
Modified: trunk/red5/debian/red5-server.default
===================================================================
--- trunk/red5/debian/red5-server.default 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/red5-server.default 2010-06-30 22:43:06 UTC (rev 12713)
@@ -11,7 +11,8 @@
# is set start-stop-daemon will chuid the server
#DAEMONUSER=_red5
-# JVM to use to start Red5
+# 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/
# JVM options for startup
Modified: trunk/red5/debian/red5-server.init
===================================================================
--- trunk/red5/debian/red5-server.init 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/red5-server.init 2010-06-30 22:43:06 UTC (rev 12713)
@@ -29,10 +29,20 @@
# Description: Flash streaming server
### END INIT INFO
+# Configuration options not overrideable
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=red5-server
+DAEMON=/usr/share/red5/red5.sh
+DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
+RED5_MAINCLASS=org.red5.server.Bootstrap
+DESC="Flash streaming server"
+PIDFILE=/var/run/$NAME.pid
+DEFAULT=/etc/default/$NAME
+
. /lib/lsb/init-functions
# Default options, these can be overriden by the information
-# at /etc/default/red5
+# at /etc/default/red5-server
# Whether to start Red5 (as a daemon or not)
NO_START=0
@@ -62,20 +72,12 @@
# End of variables that can be overwritten
# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
-fi
+[ -r $DEFAULT ] && . $DEFAULT
-#Others configuration options not overrideable
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+# Export variable used by red5.sh
+export JAVA_HOME JAVA_OPTS RED5_HOME RED5_OPTS
-DAEMON=/usr/share/red5/red5.sh
-DAEMON_STOP=/usr/share/red5/red5-shutdown.sh
-RED5_MAINCLASS=org.red5.server.Bootstrap
-NAME=red5-server
-DESC="Flash streaming server"
-PIDFILE=/var/run/$NAME.pid
-
+# Exit now if daemon binary is not installed
test -x $DAEMON || exit 0
# Check that the user exists (if we set a user)
Modified: trunk/red5/debian/red5-server.install
===================================================================
--- trunk/red5/debian/red5-server.install 2010-06-30 22:15:25 UTC (rev 12712)
+++ trunk/red5/debian/red5-server.install 2010-06-30 22:43:06 UTC (rev 12713)
@@ -32,5 +32,6 @@
webapps/red5-default.xml var/lib/red5/webapps/
webapps/root/crossdomain.xml var/lib/red5/webapps/root/
webapps/root/index.html var/lib/red5/webapps/root/
-webapps/root/favicon.ico var/lib/red5/webapps/root/
+webapps/root/*.ico var/lib/red5/webapps/root/
+webapps/root/*.png var/lib/red5/webapps/root/
webapps/root/WEB-INF/* var/lib/red5/webapps/root/WEB-INF/
More information about the pkg-java-commits
mailing list