[pkg-java] r9513 - in trunk/groovy/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-02 23:10:41 +0000 (Sun, 02 Aug 2009)
New Revision: 9513

Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/patches/ant-build.diff
Log:
* New upstream release
* Add myself to Uploaders
* Fix classpath for bnd task in the build
* Add ant to Suggests: for the groovy package as
  Ant can be embedded in some Groovy scripts

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2009-08-02 23:10:10 UTC (rev 9512)
+++ trunk/groovy/debian/changelog	2009-08-02 23:10:41 UTC (rev 9513)
@@ -1,3 +1,13 @@
+groovy (1.6.4-1) experimental; urgency=low
+
+  * New upstream release
+  * Add myself to Uploaders
+  * Fix classpath for bnd task in the build
+  * Add ant to Suggests: for the groovy package as
+    Ant can be embedded in some Groovy scripts
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 23:12:29 +0100
+
 groovy (1.6.3-2) experimental; urgency=low
 
   * Change the section to java

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2009-08-02 23:10:10 UTC (rev 9512)
+++ trunk/groovy/debian/control	2009-08-02 23:10:41 UTC (rev 9513)
@@ -2,9 +2,9 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 6), cdbs, quilt
-Build-Depends-Indep: maven-repo-helper, ant-optional, openjdk-6-jdk, bzip2, libasm2-java,
+Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, openjdk-6-jdk, bzip2, libasm2-java,
  libbsf-java, libcommons-cli-java (>= 1.0), libcommons-logging-java
  (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
  1.2), libservlet2.4-java, libxstream-java, libjline-java, antlr,
@@ -21,7 +21,7 @@
  libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>=
  0.09), libregexp-java (>= 1.2), libservlet2.4-java, libjline-java,
  libxstream-java, ivy, openjdk-6-jre-headless | java5-runtime-headless
-Suggests: groovy-doc
+Suggests: groovy-doc, ant (>= 1.7.1)
 Description: Agile dynamic language for the Java Virtual Machine
  Groovy is an agile dynamic language for the JVM combining lots of great
  features from languages like Python, Ruby and Smalltalk and making them

Modified: trunk/groovy/debian/patches/ant-build.diff
===================================================================
--- trunk/groovy/debian/patches/ant-build.diff	2009-08-02 23:10:10 UTC (rev 9512)
+++ trunk/groovy/debian/patches/ant-build.diff	2009-08-02 23:10:41 UTC (rev 9513)
@@ -49,7 +49,7 @@
      </target>
  
      <target name="-actuallyCreateJars"
-@@ -563,12 +573,12 @@
+@@ -559,12 +569,12 @@
          <delete dir="${stagingDirectory}" quiet="true"/>
          <mkdir dir="${stagingDirectory}"/>
          <unzip dest="${stagingDirectory}">
@@ -68,7 +68,7 @@
              </fileset>
          </unzip>
          <unzip dest="${stagingDirectory}">
-@@ -588,8 +598,8 @@
+@@ -584,8 +594,8 @@
                  <exclude name="META-INF/MANIFEST.MF"/>
              </patternset>
              <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
@@ -79,7 +79,7 @@
              </fileset>
          </unzip>
          <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
-@@ -661,7 +671,7 @@
+@@ -657,7 +667,7 @@
      </target>
  
      <target name="updateJarsForOsgi">
@@ -88,7 +88,7 @@
          <copy todir="${targetDistDirectory}">
              <fileset dir="config/bnd" includes="groovy*.bnd"/>
              <filterset>
-@@ -710,7 +720,6 @@
+@@ -706,7 +716,6 @@
          <mkdir dir="${installDirectory}/lib"/>
          <copy todir="${installDirectory}/lib">
              <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
@@ -96,7 +96,7 @@
          </copy>
  
          <!-- Install the embeddable bits -->
-@@ -742,12 +751,12 @@
+@@ -738,12 +747,12 @@
          </chmod>
      </target>
  
@@ -111,7 +111,7 @@
              description="Create the code style reports.">
          <checkAndReport
                  reportDirectory="${reportsDirectory}/checkstyle"
-@@ -799,7 +808,7 @@
+@@ -795,7 +804,7 @@
  
      <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
  
@@ -120,7 +120,7 @@
              description="Create the javadoc documentation.">
          <javadoc destdir="${docsDirectory}/api" author="true" version="true"
                   windowtitle="${title}" doctitle="${title}"
-@@ -835,16 +844,15 @@
+@@ -831,16 +840,15 @@
          </copy>
      </target>
  
@@ -139,7 +139,7 @@
          <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
              <classpath>
                  <path path="${mainClassesDirectory}"/>
-@@ -869,7 +877,7 @@
+@@ -867,7 +875,7 @@
          </groovydoc>
      </target>
  
@@ -148,7 +148,7 @@
          <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
              <classpath>
                  <pathelement path="${toolsClassesDirectory}"/>
-@@ -893,7 +901,7 @@
+@@ -892,7 +900,7 @@
          </delete>
      </target>
  
@@ -157,7 +157,7 @@
              description="Deploy jars to maven repository."/>
  
      <target name="-deployPlainOnly" unless="_forceRetro_">
-@@ -913,7 +921,7 @@
+@@ -912,7 +920,7 @@
          <mavenDeploy version="${groovyVersion}" prefix="groovy-all-jdk14"/>
      </target>