r524 - in /packages/red5/trunk/debian: ./ patches/
drazzib at users.alioth.debian.org
drazzib at users.alioth.debian.org
Sun May 27 22:40:32 UTC 2012
Author: drazzib
Date: Sun May 27 22:40:32 2012
New Revision: 524
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=524
Log:
* New upstream snapshot (r4374 in SVN):
- License switch to Apache-2.0 (mostly).
- Refresh all patches.
- Drop 15_jython25.diff, merged upstream.
- Upgrade instructions to get demos and installer working.
* Bump Standards-Version to 3.9.3: no changes needed.
* Wrap-and-sort debian/control.
* Add Depends on runtime dependencies (for AOP):
- libspring-aop-java
- libaopalliance-java
- libcglib-java
* d/logback.xml: Set default log level to INFO.
Removed:
packages/red5/trunk/debian/patches/15_jython25.diff
Modified:
packages/red5/trunk/debian/changelog
packages/red5/trunk/debian/control
packages/red5/trunk/debian/copyright
packages/red5/trunk/debian/libred5-java.install
packages/red5/trunk/debian/logback.xml
packages/red5/trunk/debian/patches/02_no_lib_dir.diff
packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff
packages/red5/trunk/debian/patches/11_change_jmx_port.diff
packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff
packages/red5/trunk/debian/patches/12_javadoc_links.diff
packages/red5/trunk/debian/patches/14_document_removed_stuff.diff
packages/red5/trunk/debian/patches/16_plugins_build_lib.diff
packages/red5/trunk/debian/patches/series
packages/red5/trunk/debian/red5-doc.install
packages/red5/trunk/debian/red5-server.README.Debian
packages/red5/trunk/debian/red5-server.install
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=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog (original)
+++ packages/red5/trunk/debian/changelog Sun May 27 22:40:32 2012
@@ -1,3 +1,20 @@
+red5 (1.0~svn4374-1) unstable; urgency=low
+
+ * New upstream snapshot (r4374 in SVN):
+ - License switch to Apache-2.0 (mostly).
+ - Refresh all patches.
+ - Drop 15_jython25.diff, merged upstream.
+ - Upgrade instructions to get demos and installer working.
+ * Bump Standards-Version to 3.9.3: no changes needed.
+ * Wrap-and-sort debian/control.
+ * Add Depends on runtime dependencies (for AOP):
+ - libspring-aop-java
+ - libaopalliance-java
+ - libcglib-java
+ * d/logback.xml: Set default log level to INFO.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 27 May 2012 22:58:08 +0200
+
red5 (1.0~svn4279-1) unstable; urgency=low
* New upstream snapshot (r4279 in SVN):
Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/control (original)
+++ packages/red5/trunk/debian/control Sun May 27 22:40:32 2012
@@ -2,35 +2,84 @@
Section: java
Priority: optional
Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant
-Build-Depends-Indep: libsaxon-java, docbook-xsl, ant-optional,
- libmina2-java, libslf4j-java (>= 1.6.1), liblogback-java (>= 0.9.28),
- libcommons-lang3-java, libcommons-collections3-java, libcommons-beanutils-java,
- libcommons-codec-java, libhttpcore-java, libhttpclient-java, libxerces2-java,
- libspring-core-java, libspring-beans-java, libspring-context-java,
- libspring-web-java, libbcprov-java, libehcache-java, libquartz-java,
- libjaudiotagger-java, libxmlrpc3-server-java, groovy,jython,
- libtomcat6-java (>= 6.0.20-7), glassfish-javaee, junit4 (>= 4.5),
- libhamcrest-java, libspring-test-java,
- libgroboutils-java, libcommons-logging-java,
- default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
-Standards-Version: 3.9.2
+Build-Depends: ant, cdbs, debhelper (>= 7), openjdk-6-jdk
+Build-Depends-Indep: ant-optional,
+ default-jdk-doc,
+ docbook-xsl,
+ glassfish-javaee,
+ groovy,
+ groovy-doc,
+ junit4 (>= 4.5),
+ jython,
+ libbcprov-java,
+ libcommons-beanutils-java,
+ libcommons-codec-java,
+ libcommons-collections3-java,
+ libcommons-lang3-java,
+ libcommons-logging-java,
+ libehcache-java,
+ libgroboutils-java,
+ libhamcrest-java,
+ libhttpclient-java,
+ libhttpcore-java,
+ libjaudiotagger-java,
+ liblog4j1.2-java-doc,
+ liblogback-java (>= 0.9.28),
+ libmina2-java,
+ libmina2-java-doc,
+ libquartz-java,
+ libsaxon-java,
+ libslf4j-java (>= 1.6.1),
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-core-java,
+ libspring-test-java,
+ libspring-web-java,
+ libtomcat6-java (>= 6.0.20-7),
+ libxerces2-java,
+ libxmlrpc3-server-java
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-flash/packages/red5/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/
Homepage: http://www.red5.org/
Package: libred5-java
Architecture: all
-Depends: ${misc:Depends},
- libmina2-java, libslf4j-java (>= 1.6.1), liblogback-java (>= 0.9.28),
- libcommons-lang3-java, libcommons-collections3-java, libcommons-beanutils-java,
- libhttpcore-java, libhttpclient-java, libxerces2-java, groovy, librhino-java,
- libspring-core-java, libspring-beans-java, libspring-context-java,
- libspring-web-java, libbcprov-java, libehcache-java, libquartz-java,
- 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, libxml-commons-external-java
+Depends: glassfish-javaee,
+ groovy,
+ jython,
+ libantlr-java,
+ libaopalliance-java,
+ libasm3-java,
+ libbcprov-java,
+ libcglib-java,
+ libcommons-beanutils-java,
+ libcommons-codec-java,
+ libcommons-collections3-java,
+ libcommons-lang3-java,
+ libcommons-logging-java,
+ libcommons-modeler-java,
+ libcommons-pool-java,
+ libehcache-java,
+ libhttpclient-java,
+ libhttpcore-java,
+ libjaudiotagger-java,
+ liblogback-java (>= 0.9.28),
+ libmina2-java,
+ libquartz-java,
+ librhino-java,
+ libslf4j-java (>= 1.6.1),
+ libspring-aop-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
+ libspring-web-java,
+ libstax-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ libxmlrpc3-server-java,
+ ${misc:Depends}
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,9 +92,11 @@
Package: red5-server
Architecture: all
-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)
+Depends: adduser (>= 3.11),
+ default-jre-headless (>= 1:1.6) | java6-runtime-headless,
+ libred5-java (= ${source:Version}),
+ libtomcat6-java (>= 6.0.20-7),
+ ${misc:Depends}
Conflicts: red5
Description: flash streaming server
Red5 is a Java implementation of a Flash Media Server based on
@@ -61,7 +112,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
+Recommends: default-jdk-doc, groovy-doc, liblog4j1.2-java-doc, libmina2-java-doc
Suggests: libred5-java (= ${source:Version})
Description: flash streaming server - documentation
Red5 is a Java implementation of a Flash Media Server based on
Modified: packages/red5/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/copyright?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/copyright (original)
+++ packages/red5/trunk/debian/copyright Sun May 27 22:40:32 2012
@@ -1,62 +1,51 @@
-Format-Specification: http://dep.debian.net/deps/dep5
-Name: RED5 Open Source Flash Server
-Maintainer: The Red5 Project, http://www.red5.org/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: RED5 Open Source Flash Server
+Upstream-Contact: The Red5 Project, http://www.red5.org/
Source: http://www.red5.org/downloads/
Files: *
Copyright: Copyright 2006-2009 by The Red5 Project (red5 at osflash.org)
+License: Apache-2.0
+
+Files: src/org/red5/server/service/Installer.java
+ src/org/red5/server/service/WarDeployer.java
+ src/org/red5/server/stream/provider/FileProvider.java
+ src/org/red5/server/scheduling/ApplicationSchedulingService.java
+ src/org/red5/server/session/SessionManager.java
+ plugins/*
+ test/scripts/*
+Copyright: Copyright 2006-2009 by The Red5 Project (red5 at osflash.org)
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: Copyright 2008-2009, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0
+
License: LGPL-2.1+
This library is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2.1 of the License, or (at your option) any later
version.
-
+ .
This library is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
+ .
On Debian systems the full text of the GNU Lesser General Public License
can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
-Files: src/org/red5/io/utils/DOM2Writer.java,
- src/org/red5/io/utils/HexDump.java,
- src/org/red5/server/pooling/ThreadPoolMBean.java,
- src/org/red5/server/pooling/ThreadPool.java,
- src/org/red5/server/pooling/Worker.java,
- src/org/red5/server/script/groovy/GroovyScriptFactory.java,
- src/org/red5/server/script/rhino/RhinoScriptUtils.java,
- src/org/red5/server/script/rhino/RhinoScriptFactory.java
-Copyright: Copyright 2006-2009 by The Red5 Project (red5 at osflash.org)
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+ .
http://www.apache.org/licenses/LICENSE-2.0
-
+ .
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+ .
On Debian systems the full text of the GNU Lesser General Public License
can be found in the `/usr/share/common-licenses/Apache-2.0' file.
-
-Files: debian/*
-Copyright: Copyright 2008-2009, Damien Raude-Morvan <drazzib at debian.org>
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- On Debian systems the full text of the GNU Lesser General Public License
- can be found in the `/usr/share/common-licenses/Apache-2.0' file.
Modified: packages/red5/trunk/debian/libred5-java.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/libred5-java.install?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/libred5-java.install (original)
+++ packages/red5/trunk/debian/libred5-java.install Sun May 27 22:40:32 2012
@@ -1,2 +1,2 @@
+dist/red5-remoting.jar usr/share/red5/
red5.jar usr/share/red5/
-dist/red5-remoting.jar usr/share/red5/
Modified: packages/red5/trunk/debian/logback.xml
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/logback.xml?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/logback.xml (original)
+++ packages/red5/trunk/debian/logback.xml Sun May 27 22:40:32 2012
@@ -33,7 +33,7 @@
</layout>
</appender>
<root>
- <level value="DEBUG" />
+ <level value="INFO" />
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
<appender-ref ref="ERRORFILE" />
Modified: packages/red5/trunk/debian/patches/02_no_lib_dir.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/02_no_lib_dir.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/02_no_lib_dir.diff (original)
+++ packages/red5/trunk/debian/patches/02_no_lib_dir.diff Sun May 27 22:40:32 2012
@@ -2,11 +2,9 @@
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: not-needed
Last-Update: 2011-03-04
-Index: b/build.xml
-===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -60,27 +60,31 @@
+@@ -57,27 +57,31 @@
<taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpath="${lib.dir}/${ivy.version}.jar"/>
<!-- Latest ivy 9/2008 seems to want absolute path -->
<property name="ivy.lib.dir" value="${basedir}/lib"/>
@@ -47,7 +45,7 @@
</path>
<!-- Build Targets -->
<target name="-java6.check">
-@@ -473,9 +477,11 @@
+@@ -462,9 +466,11 @@
</macrodef>
<!-- Determine classpath for jar file -->
<target name="jar-determine-classpath" depends="compile" unless="jar.classpath">
@@ -59,7 +57,7 @@
</target>
<target name="jar" description="Make Archive" depends="jar-determine-classpath">
<jar destfile="${red5.filename}.jar">
-@@ -517,14 +523,6 @@
+@@ -506,14 +512,6 @@
</jar>
</target>
<target name="dist" description="Create binary distribution" depends="jar">
Modified: packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff (original)
+++ packages/red5/trunk/debian/patches/06_use_xmlrpc3.diff Sun May 27 22:40:32 2012
@@ -7,7 +7,7 @@
Last-Update: 2011-03-04
--- a/src/org/red5/server/net/servlet/StatisticsServlet.java
+++ b/src/org/red5/server/net/servlet/StatisticsServlet.java
-@@ -21,13 +21,19 @@
+@@ -20,13 +20,19 @@
import java.io.IOException;
import java.io.OutputStream;
@@ -28,7 +28,7 @@
import org.red5.server.api.IContext;
import org.red5.server.statistics.XmlRpcScopeStatistics;
import org.springframework.web.context.WebApplicationContext;
-@@ -39,12 +45,10 @@
+@@ -38,12 +44,10 @@
* @author The Red5 Project (red5 at osflash.org)
* @author Joachim Bauch (jojo at struktur.de)
*/
@@ -42,7 +42,7 @@
protected transient WebApplicationContext webAppCtx;
protected transient IContext webContext;
-@@ -52,6 +56,7 @@
+@@ -51,6 +55,7 @@
/** {@inheritDoc} */
@Override
public void init() throws ServletException {
@@ -50,7 +50,7 @@
webAppCtx = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
if (webAppCtx == null) {
webAppCtx = (WebApplicationContext) getServletContext().getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
-@@ -61,20 +66,26 @@
+@@ -60,20 +65,26 @@
}
webContext = (IContext) webAppCtx.getBean("web.context");
Modified: packages/red5/trunk/debian/patches/11_change_jmx_port.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/11_change_jmx_port.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/11_change_jmx_port.diff (original)
+++ packages/red5/trunk/debian/patches/11_change_jmx_port.diff Sun May 27 22:40:32 2012
@@ -17,15 +17,12 @@
exec $RED5_HOME/red5.sh
--- a/src/conf/red5.properties
+++ b/src/conf/red5.properties
-@@ -62,9 +62,9 @@
- proxy.destination_port=1935
+@@ -63,7 +63,7 @@
# JMX
--jmx.rmi.port.registry=9999
-+jmx.rmi.port.registry=9980
+ jmx.rmi.host=localhost
+-jmx.rmi.port=9999
++jmx.rmi.port=9980
jmx.rmi.port.remoteobjects=
--jmx.rmi.host=0.0.0.0
-+jmx.rmi.host=127.0.0.1
- jmx.rmi.ssl=false
-
-
+ jmx.keystorepass=password
+ jmx.mina.monitor.enable=true
Modified: packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff (original)
+++ packages/red5/trunk/debian/patches/11_change_red5_bootstrap.diff Sun May 27 22:40:32 2012
@@ -5,7 +5,7 @@
Forwarded: not-needed
--- a/src/org/red5/classloading/ClassLoaderBuilder.java
+++ b/src/org/red5/classloading/ClassLoaderBuilder.java
-@@ -175,7 +175,7 @@
+@@ -174,7 +174,7 @@
}
//look over the libraries and remove the old versions
Modified: packages/red5/trunk/debian/patches/12_javadoc_links.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/12_javadoc_links.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/12_javadoc_links.diff (original)
+++ packages/red5/trunk/debian/patches/12_javadoc_links.diff Sun May 27 22:40:32 2012
@@ -2,11 +2,27 @@
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2010-04-19
Forwarded: not-needed
-Index: b/build.xml
-===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -448,16 +448,10 @@
+@@ -19,7 +19,7 @@
+ <property name="javadoc.dir" value="doc/api"/>
+ <property name="debug.state" value="true"/>
+ <!-- Documentation properties -->
+- <property name="doc.ref.dir" value="../../../doc/trunk/reference"/>
++ <property name="doc.ref.dir" value="../../../doc/reference"/>
+ <property name="doc.ref.lib" value="${doc.ref.dir}/lib"/>
+ <property name="javadoc.style" value="${doc.ref.dir}/styles/javadoc.css"/>
+ <!-- unit testing -->
+@@ -423,7 +423,7 @@
+ </delete>
+ <javadoc useexternalfile="true" failonerror="false" verbose="false" classpathref="full.classpath"
+ destdir="${javadoc.dir}" author="true" version="true" use="true" splitindex="true"
+- windowtitle="${documentation.title}" stylesheetfile="${javadoc.style}">
++ windowtitle="${documentation.title}">
+ <fileset dir="${src.dir}" defaultexcludes="yes">
+ <include name="org/red5/**"/>
+ <exclude name="**/*.xml"/>
+@@ -437,16 +437,10 @@
<group title="Streaming" packages="org.red5.server.stream:org.red5.server.stream.*"/>
<group title="IO Packages" packages="org.red5.io:org.red5.io.*"/>
<group title="Scripting" packages="org.red5.server.script:org.red5.server.script.*"/>
Modified: packages/red5/trunk/debian/patches/14_document_removed_stuff.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/14_document_removed_stuff.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/14_document_removed_stuff.diff (original)
+++ packages/red5/trunk/debian/patches/14_document_removed_stuff.diff Sun May 27 22:40:32 2012
@@ -5,7 +5,7 @@
Last-Update: 2011-03-04
--- a/webapps/root/index.html
+++ b/webapps/root/index.html
-@@ -94,6 +94,35 @@
+@@ -94,6 +94,36 @@
<br />
<br />
If you prefer to jump right in, follow these steps:
@@ -26,14 +26,15 @@
+<p>
+As root, you can install /demos (SWF files) and /installer webapp, by issuing :
+<pre>
-+wget http://www.red5.org/downloads/1_0/red5-1.0.0-RC1.zip
-+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-*
++ # wget http://wiki.red5.org/downloads/1_0/red5-1.0.0-RC2.zip
++ # mkdir red5/; cd red5;
++ # unzip ../red5-1.0.0-RC2.zip
++ # 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*
++ # /etc/init.d/red5-server restart
+</pre>
+</p>
+<i>Excerpt from /usr/share/doc/red5-server/README.Debian</i>
Modified: packages/red5/trunk/debian/patches/16_plugins_build_lib.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/16_plugins_build_lib.diff?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/16_plugins_build_lib.diff (original)
+++ packages/red5/trunk/debian/patches/16_plugins_build_lib.diff Sun May 27 22:40:32 2012
@@ -30,7 +30,7 @@
<mkdir dir="${classes.dir}"/>
</target>
@@ -39,7 +40,7 @@
- <ivy:retrieve conf="build" pattern="${basedir}/lib/[artifact](-[revision]).[ext]"/>
+ <ivy:retrieve conf="default" pattern="${basedir}/lib/[artifact](-[revision]).[ext]"/>
</target>
- <target name="compile" depends="prepare, retrieve">
Modified: packages/red5/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/series?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/series (original)
+++ packages/red5/trunk/debian/patches/series Sun May 27 22:40:32 2012
@@ -6,5 +6,4 @@
11_change_jmx_port.diff
12_javadoc_links.diff
14_document_removed_stuff.diff
-15_jython25.diff
16_plugins_build_lib.diff
Modified: packages/red5/trunk/debian/red5-doc.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-doc.install?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-doc.install (original)
+++ packages/red5/trunk/debian/red5-doc.install Sun May 27 22:40:32 2012
@@ -1,4 +1,4 @@
+doc/api/ /usr/share/doc/red5/
+doc/examples/ /usr/share/doc/red5/
doc/readme.txt /usr/share/doc/red5/
-doc/examples/ /usr/share/doc/red5/
-doc/api/ /usr/share/doc/red5/
doc/reference/html/ /usr/share/doc/red5/
Modified: packages/red5/trunk/debian/red5-server.README.Debian
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.README.Debian?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.README.Debian (original)
+++ packages/red5/trunk/debian/red5-server.README.Debian Sun May 27 22:40:32 2012
@@ -47,15 +47,15 @@
- *.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/1_0/red5-1.0.0-RC1.zip
- 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-*
-
+ # wget http://wiki.red5.org/downloads/1_0/red5-1.0.0-RC2.zip
+ # mkdir red5/; cd red5;
+ # unzip ../red5-1.0.0-RC2.zip
+ # 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*
+ # /etc/init.d/red5-server restart
Then, you can point your favorite browser to
<http://127.0.0.1:5080/installer/>
Modified: packages/red5/trunk/debian/red5-server.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.install?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.install (original)
+++ packages/red5/trunk/debian/red5-server.install Sun May 27 22:40:32 2012
@@ -37,4 +37,4 @@
webapps/root/*.png var/lib/red5/webapps/root/
webapps/root/WEB-INF/* var/lib/red5/webapps/root/WEB-INF/
-plugins/tomcat/tomcatplugin-1.1.jar var/lib/red5/plugins/
+plugins/tomcat/tomcatplugin-1.3.jar var/lib/red5/plugins/
Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.links?rev=524&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links (original)
+++ packages/red5/trunk/debian/red5-server.links Sun May 27 22:40:32 2012
@@ -48,7 +48,10 @@
/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
-
+# Spring AOP
+/usr/share/java/spring3-aop.jar usr/share/red5/lib/org.springframework.aop.jar
+/usr/share/java/aopalliance.jar usr/share/red5/lib/com.springsource.org.aopalliance.jar
+/usr/share/java/cglib.jar usr/share/red5/lib/com.springsource.net.sf.cglib.jar
# Dependencies for Tomcat Plugin
# libservlet2.5-java
More information about the pkg-flash-devel
mailing list