[pkg-java] r15203 - in branches/groovy/1.9/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-10-15 20:28:53 +0000 (Sat, 15 Oct 2011)
New Revision: 15203

Modified:
   branches/groovy/1.9/debian/changelog
   branches/groovy/1.9/debian/patches/0002-ant-build.diff.patch
Log:
* New upstream release.
* Refresh patches.


Modified: branches/groovy/1.9/debian/changelog
===================================================================
--- branches/groovy/1.9/debian/changelog	2011-10-15 20:26:39 UTC (rev 15202)
+++ branches/groovy/1.9/debian/changelog	2011-10-15 20:28:53 UTC (rev 15203)
@@ -1,3 +1,10 @@
+groovy (1.9.0~beta4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 14 Oct 2011 22:26:15 -0430
+
 groovy (1.9.0~beta3-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/groovy/1.9/debian/patches/0002-ant-build.diff.patch
===================================================================
--- branches/groovy/1.9/debian/patches/0002-ant-build.diff.patch	2011-10-15 20:26:39 UTC (rev 15202)
+++ branches/groovy/1.9/debian/patches/0002-ant-build.diff.patch	2011-10-15 20:28:53 UTC (rev 15203)
@@ -2,8 +2,8 @@
 Date: Thu, 16 Dec 2010 20:45:02 -0430
 Subject: [PATCH] ant-build.diff
 
---- groovy-1.8.0~beta3.orig/build.xml
-+++ groovy-1.8.0~beta3/build.xml
+--- groovy-1.9.0~beta4.orig/build.xml
++++ groovy-1.9.0~beta4/build.xml
 @@ -28,10 +28,17 @@
      <property name="ant.requiredVersion" value="1.6.5"/>
  
@@ -34,7 +34,7 @@
  
      <target name="-banner">
          <echo message="Java Runtime Environment version: ${java.version}"/>
-@@ -422,13 +431,13 @@
+@@ -429,13 +438,13 @@
          <fail message="Test failed, not processing further targets."/>
      </target>
  
@@ -51,7 +51,7 @@
      </target>
  
      <target name="-actuallyCreateJars"
-@@ -546,12 +555,12 @@
+@@ -555,12 +564,12 @@
          <delete dir="${stagingDirectory}" quiet="true"/>
          <mkdir dir="${stagingDirectory}"/>
          <unzip dest="${stagingDirectory}">
@@ -70,7 +70,18 @@
              </fileset>
          </unzip>
          <unzip dest="${stagingDirectory}">
-@@ -571,8 +580,8 @@
+@@ -568,8 +577,8 @@
+                 <include name="**/org/objectweb/asm/util/AbstractVisitor.class"/>
+                 <include name="**/org/objectweb/asm/util/Trace*"/>
+             </patternset>
+-            <fileset dir="${runtimeLibDirectory}">
+-                <include name="asm-util*.jar"/>
++            <fileset dir="/usr/share/java">
++                <include name="asm3-util*.jar"/>
+             </fileset>
+         </unzip>
+         <unzip dest="${stagingDirectory}">
+@@ -589,8 +598,8 @@
                  <exclude name="META-INF/MANIFEST.MF"/>
              </patternset>
              <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
@@ -81,7 +92,7 @@
              </fileset>
          </unzip>
          <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
-@@ -598,7 +607,7 @@
+@@ -616,7 +625,7 @@
              description="Build Groovy and create the jarfiles."/>
  
      <target name="updateJarsForOsgi" unless="_skipOsgi_">
@@ -90,7 +101,7 @@
          <copy todir="${targetDistDirectory}">
              <fileset dir="config/bnd" includes="groovy*.bnd"/>
              <filterset>
-@@ -656,7 +665,6 @@
+@@ -674,7 +683,6 @@
          <mkdir dir="${installDirectory}/lib"/>
          <copy todir="${installDirectory}/lib">
              <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
@@ -98,7 +109,7 @@
          </copy>
  
          <!-- Install the embeddable bits -->
-@@ -694,7 +702,7 @@
+@@ -714,7 +722,7 @@
          </chmod>
      </target>
  
@@ -107,7 +118,7 @@
              description="Create the code style reports.">
          <!-- TODO extend checkstyle to mainSourcePath -->
          <checkAndReport
-@@ -747,7 +755,7 @@
+@@ -767,7 +775,7 @@
  
      <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
  
@@ -116,7 +127,7 @@
              unless="_skipDocs_" description="Create the javadoc documentation.">
          <javadoc destdir="${docsDirectory}/api" author="true" version="true"
                   windowtitle="${title}" doctitle="${title}"
-@@ -778,15 +786,15 @@
+@@ -798,15 +806,15 @@
          </copy>
      </target>
  
@@ -135,7 +146,7 @@
          <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
              <classpath>
                  <path path="${mainClassesDirectory}"/>
-@@ -812,7 +820,7 @@
+@@ -832,7 +840,7 @@
          </groovydoc>
      </target>
  
@@ -144,7 +155,7 @@
          <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
              <classpath>
                  <pathelement path="${toolsClassesDirectory}"/>
-@@ -846,7 +854,7 @@
+@@ -866,7 +874,7 @@
          </delete>
      </target>
  
@@ -153,7 +164,7 @@
              description="Deploy jars to maven repository."/>
  
      <target name="-deployDefault" unless="_forceServerSettings_">
-@@ -867,7 +875,7 @@
+@@ -887,7 +895,7 @@
          <delete file="target/settings.xml"/>
      </target>
  
@@ -162,9 +173,9 @@
              description="Deploy artifacts to local maven repository.">
          <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
          <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
---- groovy-1.8.0~beta3.orig/config/ant/build-setup.xml
-+++ groovy-1.8.0~beta3/config/ant/build-setup.xml
-@@ -73,6 +73,7 @@
+--- groovy-1.9.0~beta4.orig/config/ant/build-setup.xml
++++ groovy-1.9.0~beta4/config/ant/build-setup.xml
+@@ -73,6 +73,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 1
              <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
                  <classpath refid="@{classpathref}"/>
                  <jvmarg value="-Duser.home=${user.home}" />