r519 - in /packages/red5/trunk/debian: ./ patches/

drazzib at users.alioth.debian.org drazzib at users.alioth.debian.org
Wed Sep 21 19:25:12 UTC 2011


Author: drazzib
Date: Wed Sep 21 19:25:11 2011
New Revision: 519

URL: http://svn.debian.org/wsvn/?sc=1&rev=519
Log:
TODO: Find a way to handle multi-arch openjdk in init.d.
* 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: 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).

Removed:
    packages/red5/trunk/debian/patches/13_jaudiotagger2.diff
Modified:
    packages/red5/trunk/debian/ant.properties
    packages/red5/trunk/debian/build.xml
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/control
    packages/red5/trunk/debian/patches/02_no_lib_dir.diff
    packages/red5/trunk/debian/patches/04_build_html_docs.diff
    packages/red5/trunk/debian/patches/12_javadoc_links.diff
    packages/red5/trunk/debian/patches/series
    packages/red5/trunk/debian/red5-server.README.Debian
    packages/red5/trunk/debian/red5-server.install
    packages/red5/trunk/debian/red5-server.links
    packages/red5/trunk/debian/rules

Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/ant.properties?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties (original)
+++ packages/red5/trunk/debian/ant.properties Wed Sep 21 19:25:11 2011
@@ -7,19 +7,21 @@
 /usr/share/java/jul-to-slf4j.jar;\
 /usr/share/java/logback-core.jar;\
 /usr/share/java/logback-classic.jar;\
-/usr/share/java/commons-lang.jar;\
+/usr/share/java/commons-lang3.jar;\
 /usr/share/java/commons-collections3.jar;\
 /usr/share/java/commons-beanutils.jar;\
-/usr/share/java/commons-httpclient.jar;\
 /usr/share/java/commons-codec.jar;\
 /usr/share/java/groovy.jar;\
+/usr/share/java/httpcore.jar;\
+/usr/share/java/httpcore-nio.jar;\
+/usr/share/java/httpclient.jar;\
 /usr/share/java/spring3-core.jar;\
 /usr/share/java/spring3-beans.jar;\
 /usr/share/java/spring3-context.jar;\
 /usr/share/java/spring3-web.jar;\
 /usr/share/java/bcprov.jar;\
 /usr/share/java/ehcache.jar;\
-/usr/share/java/quartz-all.jar;\
+/usr/share/java/quartz.jar;\
 /usr/share/java/jaudiotagger.jar;\
 /usr/share/java/xmlrpc-server-3.1.jar;\
 /usr/share/java/xmlrpc-common-3.1.jar;\

Modified: packages/red5/trunk/debian/build.xml
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/build.xml?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/build.xml (original)
+++ packages/red5/trunk/debian/build.xml Wed Sep 21 19:25:11 2011
@@ -12,6 +12,8 @@
 			<target name="jar"/>
 			<target name="remote-jar"/>
 			<target name="javadoc"/>
+		</ant>
+		<ant dir="${basedir}/doc/reference/">
 			<target name="doc-html"/>
 		</ant>
 		<ant dir="${basedir}/plugins/tomcat" target="all"/>

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/changelog?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog (original)
+++ packages/red5/trunk/debian/changelog Wed Sep 21 19:25:11 2011
@@ -1,9 +1,20 @@
-red5 (1.0~svn4198-3) UNRELEASED; urgency=low
+red5 (1.0~svn4279-1) UNRELEASED; urgency=low
 
-  * Bump Standards-Version to 3.9.2: no changes needed.
-  * Depends on librhino-java instead of rhino.
+  TODO: Find a way to handle multi-arch openjdk in init.d.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 25 May 2011 23:33:05 +0200
+  * 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: 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).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 21 Sep 2011 21:24:39 +0200
 
 red5 (1.0~svn4198-2) unstable; urgency=low
 

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/control?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/control (original)
+++ packages/red5/trunk/debian/control Wed Sep 21 19:25:11 2011
@@ -5,8 +5,8 @@
 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-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
- libcommons-codec-java, libcommons-httpclient-java, libxerces2-java,
+ 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,
@@ -23,8 +23,8 @@
 Architecture: all
 Depends: ${misc:Depends},
  libmina2-java, libslf4j-java (>= 1.6.1), liblogback-java (>= 0.9.28),
- libcommons-lang-java, libcommons-collections3-java, libcommons-beanutils-java,
- libcommons-httpclient-java, libxerces2-java, groovy, librhino-java,
+ 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,

Modified: packages/red5/trunk/debian/patches/02_no_lib_dir.diff
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/patches/02_no_lib_dir.diff?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/02_no_lib_dir.diff (original)
+++ packages/red5/trunk/debian/patches/02_no_lib_dir.diff Wed Sep 21 19:25:11 2011
@@ -2,6 +2,8 @@
 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 @@
@@ -45,7 +47,7 @@
  	</path>
  	<!-- Build Targets -->
  	<target name="-java6.check">
-@@ -482,9 +486,11 @@
+@@ -473,9 +477,11 @@
  	</macrodef>
  	<!-- Determine classpath for jar file -->
  	<target name="jar-determine-classpath" depends="compile" unless="jar.classpath">
@@ -57,7 +59,7 @@
  	</target>
  	<target name="jar" description="Make Archive" depends="jar-determine-classpath">
  		<jar destfile="${red5.filename}.jar">
-@@ -526,14 +532,6 @@
+@@ -517,14 +523,6 @@
  		</jar>
  	</target>
  	<target name="dist" description="Create binary distribution" depends="jar">

Modified: packages/red5/trunk/debian/patches/04_build_html_docs.diff
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/patches/04_build_html_docs.diff?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/04_build_html_docs.diff (original)
+++ packages/red5/trunk/debian/patches/04_build_html_docs.diff Wed Sep 21 19:25:11 2011
@@ -5,26 +5,30 @@
    Debian package: docbook-xsl
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: no
-Last-Update: 2009-10-03
---- a/build.xml
-+++ b/build.xml
-@@ -1060,9 +1060,14 @@
+Last-Update: 2011-09-21
+Index: b/doc/reference/build.xml
+===================================================================
+--- a/doc/reference/build.xml
++++ b/doc/reference/build.xml
+@@ -22,9 +22,14 @@
  				 else="">
  				<equals arg1="@{xincludes}" arg2="true"/>
  			</condition>
 -			<java classname="com.icl.saxon.StyleSheet" fork="true" dir="@{basedir}" classpathref="doc.lib.classpath">
 +			<java classname="com.icl.saxon.StyleSheet" fork="true" dir="@{basedir}">
-+                                <classpath>
-+                                        <pathelement location="/usr/share/java/saxon.jar"/>
-+                                        <pathelement location="/usr/share/java/xercesImpl.jar"/>
-+                                        <pathelement location="/usr/share/java/xmlParserAPIs.jar"/>
-+                                </classpath>
++                <classpath>
++                    <pathelement location="/usr/share/java/saxon.jar"/>
++                    <pathelement location="/usr/share/java/xercesImpl.jar"/>
++                    <pathelement location="/usr/share/java/xmlParserAPIs.jar"/>
++                </classpath>
  				<jvmarg line="${xslt.xincludes}"/>
--				<jvmarg value="-Dxslthl.config=file://${basedir}/${doc.ref.dir}/lib/docbook-xsl-ns/highlighting/xslthl-config.xml"/>
+-				<jvmarg value="-Dxslthl.config=file://${doc.ref.dir}/lib/docbook-xsl-ns/highlighting/xslthl-config.xml"/>
 +				<jvmarg value="-Dxslthl.config=file:///usr/share/xml/docbook/stylesheet/nwalsh/highlighting/xslthl-config.xml"/>
  				<jvmarg value="-Xms128m"/>
  				<jvmarg value="-Xmx512m"/>
  				<arg line="${xslt.out} @{in} @{style} @{params}"/>
+Index: b/doc/reference/styles/html_chunk.xsl
+===================================================================
 --- a/doc/reference/styles/html_chunk.xsl
 +++ b/doc/reference/styles/html_chunk.xsl
 @@ -3,7 +3,7 @@
@@ -36,14 +40,3 @@
      <!ENTITY callout_gfx_path   "../images/callouts/">
      <!ENTITY admon_gfx_path     "../images/admons/">
  ]>
---- a/doc/reference/src/index.xml
-+++ b/doc/reference/src/index.xml
-@@ -49,7 +49,7 @@
- 	<toc/>
- 
-     
--    <xi:include href="Introduction.xml" />
-+    <xi:include href="introduction.xml" />
-     
-     <xi:include href="WhatsNew.xml" />
- 	

Modified: packages/red5/trunk/debian/patches/12_javadoc_links.diff
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/patches/12_javadoc_links.diff?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/12_javadoc_links.diff (original)
+++ packages/red5/trunk/debian/patches/12_javadoc_links.diff Wed Sep 21 19:25:11 2011
@@ -2,26 +2,28 @@
 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
-@@ -457,16 +457,10 @@
+@@ -448,16 +448,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.*"/>
--			<link href="http://java.sun.com/${javadoc.loc}/docs/api"/>
+-			<link href="http://download.oracle.com/${javadoc.loc}/docs/api"/>
 -			<link href="http://jetty.codehaus.org/jetty/jetty-6/apidocs"/>
 -			<link href="http://mina.apache.org/report/trunk/apidocs"/>
 -			<link href="http://static.springsource.org/spring/docs/2.5.x/api"/>
--			<link href="http://www.quartz-scheduler.org/docs/api"/>
+-			<!-- <link href="http://www.quartz-scheduler.org/docs/api"/> -->
 -			<link href="http://www.slf4j.org/api"/>
 -			<link href="http://logging.apache.org/log4j/1.2/apidocs"/>
 -			<link href="http://groovy.codehaus.org/api"/>
 -			<link href="http://tomcat.apache.org/tomcat-6.0-doc/api"/>
 -			<link href="http://ehcache.org/apidocs"/>
-+			<link href="/usr/share/doc/default-jdk-doc/api/"/>
-+			<link href="/usr/share/doc/libmina2-java/api/"/>
-+			<link href="/usr/share/doc/liblog4j1.2-java/api/"/>
-+			<link href="/usr/share/doc/groovy/api/"/>
++            <link href="/usr/share/doc/default-jdk-doc/api/"/>
++            <link href="/usr/share/doc/libmina2-java/api/"/>
++            <link href="/usr/share/doc/liblog4j1.2-java/api/"/>
++            <link href="/usr/share/doc/groovy/api/"/>
  		</javadoc>
  		<echo message="Javadoc API stub: ${javadoc.loc}"/>
  		<echo message="Javadoc CSS: ${doc.ref.dir} ${javadoc.style}"/>

Modified: packages/red5/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/patches/series?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/series (original)
+++ packages/red5/trunk/debian/patches/series Wed Sep 21 19:25:11 2011
@@ -5,7 +5,6 @@
 11_change_red5_bootstrap.diff
 11_change_jmx_port.diff
 12_javadoc_links.diff
-13_jaudiotagger2.diff
 14_document_removed_stuff.diff
 15_jython25.diff
 16_plugins_build_lib.diff

Modified: packages/red5/trunk/debian/red5-server.README.Debian
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/red5-server.README.Debian?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.README.Debian (original)
+++ packages/red5/trunk/debian/red5-server.README.Debian Wed Sep 21 19:25:11 2011
@@ -1,11 +1,5 @@
 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
 ---------
@@ -42,8 +36,8 @@
 
 You can edit port mapping in /etc/red5/red5.properties
 
-Demos
------
+Demos / Installer
+-----------------
 Debian "red5-server" package doesn't contains /demos or /installer webapps.
 Please note that /installer and /demos webapps are for demonstration purpose
 only and should never be installed on a public red5 server
@@ -62,6 +56,18 @@
  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).
+
+NB: If you only got a 404 or 500 error page, this is because you try to access
+installer by remote access (ie. disabled by default).
+If you want to enable remote access to installer, you can edit
+  /var/lib/red5/webapps/installer/WEB-INF/red5-web.properties
+and change value of
+  webapp.virtualHosts=localhost, localhost:5080
+to 
+  webapp.virtualHosts=*
+After installing some application, you should revert this back to keep your
+server secure.

Modified: packages/red5/trunk/debian/red5-server.install
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/red5-server.install?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.install (original)
+++ packages/red5/trunk/debian/red5-server.install Wed Sep 21 19:25:11 2011
@@ -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.0.jar var/lib/red5/plugins/
+plugins/tomcat/tomcatplugin-1.1.jar var/lib/red5/plugins/

Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/red5-server.links?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links (original)
+++ packages/red5/trunk/debian/red5-server.links Wed Sep 21 19:25:11 2011
@@ -11,8 +11,7 @@
 /usr/share/java/antlr.jar usr/share/red5/lib/com.springsource.org.antlr.jar
 /usr/share/java/commons-codec.jar usr/share/red5/lib/com.springsource.org.apache.commons.codec.jar
 /usr/share/java/commons-collections3.jar usr/share/red5/lib/com.springsource.org.apache.commons.collections.jar
-/usr/share/java/commons-httpclient.jar usr/share/red5/lib/com.springsource.org.apache.commons.httpclient.jar
-/usr/share/java/commons-lang.jar usr/share/red5/lib/com.springsource.org.apache.commons.lang.jar
+/usr/share/java/commons-lang3.jar usr/share/red5/lib/com.springsource.org.apache.commons.lang3.jar
 /usr/share/java/commons-modeler.jar usr/share/red5/lib/com.springsource.org.apache.commons.modeler.jar
 /usr/share/java/commons-pool.jar usr/share/red5/lib/com.springsource.org.apache.commons.pool.jar
 /usr/share/java/xercesImpl.jar usr/share/red5/lib/com.springsource.org.apache.xerces.jar
@@ -25,6 +24,9 @@
 /usr/share/java/ehcache.jar usr/share/red5/lib/ehcache.jar
 /usr/share/java/jaudiotagger.jar usr/share/red5/lib/jaudiotagger.jar
 /usr/share/java/glassfish-javaee.jar usr/share/red5/lib/javaee-api.jar
+/usr/share/java/httpcore.jar usr/share/red5/lib/httpcore.jar
+/usr/share/java/httpcore-nio.jar usr/share/red5/lib/httpcore-nio.jar
+/usr/share/java/httpclient.jar usr/share/red5/lib/httpclient.jar
 /usr/share/java/jcl-over-slf4j.jar usr/share/red5/lib/jcl-over-slf4j.jar
 # jruby-complete-1.1.6.jar: NON-FREE
 /usr/share/java/jul-to-slf4j.jar usr/share/red5/lib/jul-to-slf4j.jar

Modified: packages/red5/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/rules?rev=519&op=diff
==============================================================================
--- packages/red5/trunk/debian/rules (original)
+++ packages/red5/trunk/debian/rules Wed Sep 21 19:25:11 2011
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
 
 DEB_ANT_BUILDFILE    := debian/build.xml
 # Build classpath is set via ant.properties




More information about the pkg-flash-devel mailing list