r557 - in /packages/red5/trunk/debian: ant.properties changelog control patches/12_javadoc_links.diff red5-server.links

[ebourg-guest at users.alioth.debian.org]

Author: ebourg-guest
Date: Tue May  3 15:45:21 2016
New Revision: 557

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=557
Log:
Transition back to Groovy


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

Modified: packages/red5/trunk/debian/ant.properties
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/ant.properties?rev=557&op=diff
==============================================================================
--- packages/red5/trunk/debian/ant.properties	(original)
+++ packages/red5/trunk/debian/ant.properties	Tue May  3 15:45:21 2016
@@ -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-2.x.jar;\
+/usr/share/java/groovy.jar;\
 /usr/share/java/httpcore.jar;\
 /usr/share/java/httpcore-nio.jar;\
 /usr/share/java/httpclient.jar;\

Modified: packages/red5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/changelog?rev=557&op=diff
==============================================================================
--- packages/red5/trunk/debian/changelog	(original)
+++ packages/red5/trunk/debian/changelog	Tue May  3 15:45:21 2016
@@ -1,3 +1,10 @@
+red5 (1.0~svn4374-4.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Transition back to Groovy
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 May 2016 17:44:13 +0200
+
 red5 (1.0~svn4374-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: packages/red5/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/control?rev=557&op=diff
==============================================================================
--- packages/red5/trunk/debian/control	(original)
+++ packages/red5/trunk/debian/control	Tue May  3 15:45:21 2016
@@ -7,8 +7,8 @@
                      default-jdk-doc,
                      docbook-xsl,
                      glassfish-javaee,
-                     groovy2,
-                     groovy2-doc,
+                     groovy,
+                     groovy-doc,
                      junit4 (>= 4.5),
                      jython,
                      libbcprov-java,
@@ -46,7 +46,7 @@
 Package: libred5-java
 Architecture: all
 Depends: glassfish-javaee,
-         groovy2,
+         groovy,
          jython,
          libantlr-java,
          libaopalliance-java,
@@ -112,7 +112,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Recommends: default-jdk-doc, groovy2-doc, liblog4j1.2-java-doc, libmina2-java-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/patches/12_javadoc_links.diff
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/patches/12_javadoc_links.diff?rev=557&op=diff
==============================================================================
--- packages/red5/trunk/debian/patches/12_javadoc_links.diff	(original)
+++ packages/red5/trunk/debian/patches/12_javadoc_links.diff	Tue May  3 15:45:21 2016
@@ -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/groovy2/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/red5-server.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/red5/trunk/debian/red5-server.links?rev=557&op=diff
==============================================================================
--- packages/red5/trunk/debian/red5-server.links	(original)
+++ packages/red5/trunk/debian/red5-server.links	Tue May  3 15:45:21 2016
@@ -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-2.x.jar usr/share/red5/lib/com.springsource.org.codehaus.groovy.jar
+/usr/share/java/groovy.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