[pkg-java] r11726 - trunk/groovy/debian/patches

[Varun Hiremath]

Author: varun
Date: 2010-02-26 21:18:27 +0000 (Fri, 26 Feb 2010)
New Revision: 11726

Modified:
   trunk/groovy/debian/patches/ant-build.diff
Log:
* update patches

Modified: trunk/groovy/debian/patches/ant-build.diff
===================================================================
--- trunk/groovy/debian/patches/ant-build.diff	2010-02-26 21:12:44 UTC (rev 11725)
+++ trunk/groovy/debian/patches/ant-build.diff	2010-02-26 21:18:27 UTC (rev 11726)
@@ -1,7 +1,7 @@
-Index: groovy-1.7.0/build.xml
+Index: groovy-1.7.1/build.xml
 ===================================================================
---- groovy-1.7.0.orig/build.xml	2009-12-09 14:14:12.000000000 -0500
-+++ groovy-1.7.0/build.xml	2010-02-17 19:01:49.000000000 -0500
+--- groovy-1.7.1.orig/build.xml	2010-02-17 16:44:50.000000000 -0500
++++ groovy-1.7.1/build.xml	2010-02-26 16:15:57.000000000 -0500
 @@ -28,10 +28,17 @@
      <property name="ant.requiredVersion" value="1.6.5"/>
  
@@ -32,7 +32,7 @@
  
      <target name="-banner">
          <echo message="Java Runtime Environment version: ${java.version}"/>
-@@ -408,13 +417,13 @@
+@@ -406,13 +415,13 @@
          <fail message="Test failed, not processing further targets."/>
      </target>
  
@@ -49,7 +49,7 @@
      </target>
  
      <target name="-actuallyCreateJars"
-@@ -526,12 +535,12 @@
+@@ -524,12 +533,12 @@
          <delete dir="${stagingDirectory}" quiet="true"/>
          <mkdir dir="${stagingDirectory}"/>
          <unzip dest="${stagingDirectory}">
@@ -68,7 +68,7 @@
              </fileset>
          </unzip>
          <unzip dest="${stagingDirectory}">
-@@ -551,8 +560,8 @@
+@@ -549,8 +558,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" />
-@@ -576,7 +585,7 @@
+@@ -574,7 +583,7 @@
              description="Build Groovy and create the jarfiles."/>
  
      <target name="updateJarsForOsgi" unless="_skipOsgi_">
@@ -88,7 +88,7 @@
          <copy todir="${targetDistDirectory}">
              <fileset dir="config/bnd" includes="groovy*.bnd"/>
              <filterset>
-@@ -632,7 +641,6 @@
+@@ -630,7 +639,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 -->
-@@ -664,7 +672,7 @@
+@@ -662,7 +670,7 @@
          </chmod>
      </target>
  
@@ -105,7 +105,7 @@
              description="Create the code style reports.">
          <checkAndReport
                  reportDirectory="${reportsDirectory}/checkstyle"
-@@ -716,7 +724,7 @@
+@@ -714,7 +722,7 @@
  
      <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
  
@@ -114,7 +114,7 @@
              description="Create the javadoc documentation.">
          <javadoc destdir="${docsDirectory}/api" author="true" version="true"
                   windowtitle="${title}" doctitle="${title}"
-@@ -742,16 +750,15 @@
+@@ -741,15 +749,14 @@
          </copy>
      </target>
  
@@ -123,7 +123,6 @@
          <path id="groovydocpath">
              <path path="${mainClassesDirectory}"/>
 -            <path refid="runtimePath"/>
-             <path path="${java.class.path}"/>
          </path>
          <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
      </target>
@@ -133,7 +132,7 @@
          <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
              <classpath>
                  <path path="${mainClassesDirectory}"/>
-@@ -778,7 +785,7 @@
+@@ -775,7 +782,7 @@
          </groovydoc>
      </target>
  
@@ -158,10 +157,10 @@
              description="Deploy artifacts to local maven repository.">
          <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
          <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
-Index: groovy-1.7.0/config/ant/build-setup.xml
+Index: groovy-1.7.1/config/ant/build-setup.xml
 ===================================================================
---- groovy-1.7.0.orig/config/ant/build-setup.xml	2009-12-09 14:14:10.000000000 -0500
-+++ groovy-1.7.0/config/ant/build-setup.xml	2010-02-17 19:03:01.000000000 -0500
+--- groovy-1.7.1.orig/config/ant/build-setup.xml	2009-11-27 18:03:12.000000000 -0500
++++ groovy-1.7.1/config/ant/build-setup.xml	2010-02-26 16:14:24.000000000 -0500
 @@ -67,6 +67,7 @@
              <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
                  <classpath refid="@{classpathref}"/>