Source: red5
Version: 1.0~svn4374-4
Severity: normal
Tags: patch
Dear Maintainer,
Groovy 1.x is going to be removed soon and red5 has to switch to Groovy 2.
Please apply the patch attached.
Thank you,
Emmanuel Bourg
Index: debian/ant.properties
===================================================================
--- debian/ant.properties (revision 555)
+++ debian/ant.properties (working copy)
@@ -11,7 +11,7 @@
/usr/share/java/commons-collections3.jar;\
/usr/share/java/commons-beanutils.jar;\
/usr/share/java/commons-codec.jar;\
-/usr/share/java/groovy.jar;\
+/usr/share/java/groovy-2.x.jar;\
/usr/share/java/httpcore.jar;\
/usr/share/java/httpcore-nio.jar;\
/usr/share/java/httpclient.jar;\
Index: debian/changelog
===================================================================
--- debian/changelog (revision 555)
+++ debian/changelog (working copy)
@@ -1,3 +1,10 @@
+red5 (1.0~svn4374-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Transition to Groovy 2
+
+ -- Emmanuel Bourg <ebo...@apache.org> Fri, 20 Nov 2015 13:17:11 +0100
+
red5 (1.0~svn4374-4) unstable; urgency=medium
[ Emmanuel Bourg ]
Index: debian/control
===================================================================
--- debian/control (revision 555)
+++ debian/control (working copy)
@@ -7,8 +7,8 @@
default-jdk-doc,
docbook-xsl,
glassfish-javaee,
- groovy,
- groovy-doc,
+ groovy2,
+ groovy2-doc,
junit4 (>= 4.5),
jython,
libbcprov-java,
@@ -46,7 +46,7 @@
Package: libred5-java
Architecture: all
Depends: glassfish-javaee,
- groovy,
+ groovy2,
jython,
libantlr-java,
libaopalliance-java,
@@ -112,7 +112,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: default-jdk-doc, groovy-doc, liblog4j1.2-java-doc, libmina2-java-doc
+Recommends: default-jdk-doc, groovy2-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
Index: debian/patches/12_javadoc_links.diff
===================================================================
--- debian/patches/12_javadoc_links.diff (revision 555)
+++ debian/patches/12_javadoc_links.diff (working copy)
@@ -39,7 +39,7 @@
+ <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/groovy2/api/"/>
</javadoc>
<echo message="Javadoc API stub: ${javadoc.loc}"/>
<echo message="Javadoc CSS: ${doc.ref.dir} ${javadoc.style}"/>
Index: debian/red5-server.links
===================================================================
--- debian/red5-server.links (revision 555)
+++ debian/red5-server.links (working copy)
@@ -15,7 +15,7 @@
/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
-/usr/share/java/groovy.jar usr/share/red5/lib/com.springsource.org.codehaus.groovy.jar
+/usr/share/java/groovy-2.x.jar usr/share/red5/lib/com.springsource.org.codehaus.groovy.jar
/usr/share/java/js.jar usr/share/red5/lib/com.springsource.org.mozilla.javascript.jar
/usr/share/java/asm4.jar usr/share/red5/lib/com.springsource.org.objectweb.asm.jar
/usr/share/java/asm4-commons.jar usr/share/red5/lib/com.springsource.org.objectweb.asm.commons.jar
