[pkg-java] r11370 - in trunk/red5/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-01-17 19:43:45 +0000 (Sun, 17 Jan 2010)
New Revision: 11370

Modified:
   trunk/red5/debian/changelog
   trunk/red5/debian/control
   trunk/red5/debian/patches/12_javadoc_links.diff
   trunk/red5/debian/red5-server.links
Log:
* Target unstable distribution
* Build-Depends and use default-jdk-doc instead of openjdk-6-doc
* red5-doc now Recommends default-jdk-doc

Modified: trunk/red5/debian/changelog
===================================================================
--- trunk/red5/debian/changelog	2010-01-17 19:41:52 UTC (rev 11369)
+++ trunk/red5/debian/changelog	2010-01-17 19:43:45 UTC (rev 11370)
@@ -1,3 +1,11 @@
+red5 (0.9~svn3968-2) unstable; urgency=low
+
+  * Target unstable distribution
+  * Build-Depends and use default-jdk-doc instead of openjdk-6-doc
+  * red5-doc now Recommends default-jdk-doc
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 14:04:49 +0100
+
 red5 (0.9~svn3968-1) experimental; urgency=low
 
   * Initial release. (Closes: #503594)

Modified: trunk/red5/debian/control
===================================================================
--- trunk/red5/debian/control	2010-01-17 19:41:52 UTC (rev 11369)
+++ trunk/red5/debian/control	2010-01-17 19:43:45 UTC (rev 11370)
@@ -14,7 +14,7 @@
  libhamcrest-java, ant-optional, libspring-test-2.5-java,
  libgroboutils-java, libcommons-logging-java, libjetty-java, jython,
  libbackport-util-concurrent-java,
- openjdk-6-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
+ default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/red5/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/red5/
@@ -63,6 +63,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libmina2-java-doc, liblog4j1.2-java-doc, groovy-doc
 Suggests: libred5-java (= ${source:Version})
 Description: flash streaming server - documentation
  Red5 is a Java implementation of a Flash Media Server based on

Modified: trunk/red5/debian/patches/12_javadoc_links.diff
===================================================================
--- trunk/red5/debian/patches/12_javadoc_links.diff	2010-01-17 19:41:52 UTC (rev 11369)
+++ trunk/red5/debian/patches/12_javadoc_links.diff	2010-01-17 19:43:45 UTC (rev 11370)
@@ -1,6 +1,6 @@
 Description: Change javadocs links to use local Javadocs
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-11-28
+Last-Update: 2009-12-12
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
@@ -18,7 +18,7 @@
 -			<link href="http://groovy.codehaus.org/api"/>
 -			<link href="http://tomcat.apache.org/tomcat-6.0-doc/api"/>
 -			<link href="http://ehcache.sourceforge.net/javadoc"/>
-+			<link href="/usr/share/doc/openjdk-6-jre/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/"/>

Modified: trunk/red5/debian/red5-server.links
===================================================================
--- trunk/red5/debian/red5-server.links	2010-01-17 19:41:52 UTC (rev 11369)
+++ trunk/red5/debian/red5-server.links	2010-01-17 19:43:45 UTC (rev 11370)
@@ -40,8 +40,10 @@
 # el-api-.jar (use glassfish-javaee)
 # groovy-all-1.5.7.jar
 /usr/share/java/groovy.jar usr/share/red5/lib/groovy.jar
-# jasper-6.0.20.jar && jasper-el-6.0.20.jar
+# jasper-6.0.20.jar
 /usr/share/java/jasper.jar usr/share/red5/lib/jasper.jar
+# jasper-el-6.0.20.jar
+/usr/share/java/jasper-el.jar usr/share/red5/lib/jasper-el.jar
 # jasper-jdt-6.0.20.jar
 /usr/share/java/ecj.jar usr/share/red5/lib/jasper-jdt.jar
 # jaudiotagger-1.0.8.jar