r546 - in /packages/red5/trunk/debian: ant.properties changelog control patches/04_build_html_docs.diff red5-server.links

[drazzib at users.alioth.debian.org]

Author: drazzib
Date: Wed Sep 11 21:57:23 2013
New Revision: 546

URL: http://svn.debian.org/wsvn/?sc=1&rev=546
Log:
* Fix FTBFS with updated libxmlrpc3-server-java (Closes: #717261):
  - d/{ant.properties,red5-server.links}: Update JAR location.
* Bump Standards-Version to 3.9.4: no changes needed.
* d/control: Fix Vcs-* fields to use canonical URLs. 

Modified:
    packages/red5/trunk/debian/ant.properties
    packages/red5/trunk/debian/changelog
    packages/red5/trunk/debian/control
    packages/red5/trunk/debian/patches/04_build_html_docs.diff
    packages/red5/trunk/debian/red5-server.links

Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/ant.properties?rev=546&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties	(original)
+++ packages/red5/trunk/debian/ant.properties	Wed Sep 11 21:57:23 2013
@@ -23,8 +23,8 @@
 /usr/share/java/ehcache.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;\
+/usr/share/java/xmlrpc-server.jar;\
+/usr/share/java/xmlrpc-common.jar;\
 /usr/share/tomcat6/lib/catalina.jar;\
 /usr/share/tomcat6/lib/tomcat-coyote.jar;\
 /usr/share/java/glassfish-javaee.jar;\

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/changelog?rev=546&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog	(original)
+++ packages/red5/trunk/debian/changelog	Wed Sep 11 21:57:23 2013
@@ -1,3 +1,12 @@
+red5 (1.0~svn4374-3) unstable; urgency=low
+
+  * Fix FTBFS with updated libxmlrpc3-server-java (Closes: #717261):
+    - d/{ant.properties,red5-server.links}: Update JAR location.
+  * Bump Standards-Version to 3.9.4: no changes needed.
+  * d/control: Fix Vcs-* fields to use canonical URLs. 
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 25 Aug 2013 11:18:10 +0200
+
 red5 (1.0~svn4374-2) unstable; urgency=low
 
   [ James Page ]

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/control?rev=546&op=diff
==============================================================================
--- packages/red5/trunk/debian/control	(original)
+++ packages/red5/trunk/debian/control	Wed Sep 11 21:57:23 2013
@@ -38,9 +38,9 @@
                      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/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-flash/packages/red5/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-flash/packages/red5/trunk/
 Homepage: http://www.red5.org/
 
 Package: libred5-java

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=546&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 11 21:57:23 2013
@@ -6,8 +6,6 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: no
 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 @@
@@ -27,8 +25,6 @@
  				<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 @@

Modified: packages/red5/trunk/debian/red5-server.links
URL: http://svn.debian.org/wsvn/packages/red5/trunk/debian/red5-server.links?rev=546&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links	(original)
+++ packages/red5/trunk/debian/red5-server.links	Wed Sep 11 21:57:23 2013
@@ -45,8 +45,8 @@
 /usr/share/java/spring3-expression.jar usr/share/red5/lib/org.springframework.expression.jar
 /usr/share/java/spring3-web.jar usr/share/red5/lib/org.springframework.web.jar
 /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/xmlrpc-server.jar usr/share/red5/lib/xmlrpc-server.jar
+/usr/share/java/xmlrpc-common.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