[pkg-java] r15202 - in trunk/groovy/debian: . patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sat Oct 15 20:26:40 UTC 2011
Author: nomadium-guest
Date: 2011-10-15 20:26:39 +0000 (Sat, 15 Oct 2011)
New Revision: 15202
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/patches/0002-ant-build.diff.patch
trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
Log:
* New upstream release.
* Refresh patches.
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2011-10-15 17:00:46 UTC (rev 15201)
+++ trunk/groovy/debian/changelog 2011-10-15 20:26:39 UTC (rev 15202)
@@ -1,3 +1,10 @@
+groovy (1.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 13 Oct 2011 21:36:25 -0430
+
groovy (1.8.2-1) unstable; urgency=low
* New upstream release.
Modified: trunk/groovy/debian/patches/0002-ant-build.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0002-ant-build.diff.patch 2011-10-15 17:00:46 UTC (rev 15201)
+++ trunk/groovy/debian/patches/0002-ant-build.diff.patch 2011-10-15 20:26:39 UTC (rev 15202)
@@ -2,166 +2,166 @@
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.8.3.org/build.xml
++++ groovy-1.8.3/build.xml
@@ -28,10 +28,17 @@
- <property name="ant.requiredVersion" value="1.6.5"/>
-
- <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
-- <import file="config/ant/build-maven.xml"/>
-+ <import file="config/ant/build-setup.xml"/>
- <import file="config/ant/build-checkstyle.xml"/>
- <import file="config/ant/build-cobertura.xml"/>
-
-+ <path id="compilePath">
-+ <path path="${java.class.path}" />
-+ </path>
-+ <path id="toolsPath">
-+ <path path="${java.class.path}" />
-+ </path>
-+
- <condition property="_skipTests_">
- <or>
- <equals arg1="${test}" arg2="false"/>
+ <property name="ant.requiredVersion" value="1.6.5"/>
+
+ <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
+- <import file="config/ant/build-maven.xml"/>
++ <import file="config/ant/build-setup.xml"/>
+ <import file="config/ant/build-checkstyle.xml"/>
+ <import file="config/ant/build-cobertura.xml"/>
+
++ <path id="compilePath">
++ <path path="${java.class.path}" />
++ </path>
++ <path id="toolsPath">
++ <path path="${java.class.path}" />
++ </path>
++
+ <condition property="_skipTests_">
+ <or>
+ <equals arg1="${test}" arg2="false"/>
@@ -96,7 +103,9 @@
- </antlr>
- </target>
-
-- <target name="-init" depends="-fetchDependencies"/>
-+ <target name="-init">
-+ <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
-+ </target>
-
- <target name="-banner">
- <echo message="Java Runtime Environment version: ${java.version}"/>
-@@ -422,13 +431,13 @@
- <fail message="Test failed, not processing further targets."/>
- </target>
-
-- <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
-+ <target name="-coverageInstrument" if="_forceCoverage_">
- <mkdir dir="${instrumentedClassesDirectory}"/>
-- <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
-+ <!--<coberturaInstrument classesDirectory="${mainClassesDirectory}"/>-->
- </target>
-
- <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
-- <coberturaReport reportDirectory="${reportsDirectory}/cobertura"/>
-+ <!--<coberturaReport reportDirectory="${reportsDirectory}/cobertura"/>-->
- </target>
-
- <target name="-actuallyCreateJars"
-@@ -546,12 +555,12 @@
- <delete dir="${stagingDirectory}" quiet="true"/>
- <mkdir dir="${stagingDirectory}"/>
- <unzip dest="${stagingDirectory}">
-- <fileset dir="${runtimeLibDirectory}">
-- <include name="antlr*.jar"/>
-- <include name="asm*.jar"/>
-- <exclude name="asm-attr*.jar"/>
-- <exclude name="asm-util*.jar"/>
-- <exclude name="asm-analysis*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="antlr.jar"/>
-+ <include name="asm3.jar"/>
-+ <include name="asm3-commons.jar"/>
-+ <include name="asm3-tree.jar"/>
-+ <include name="asm3-xml.jar"/>
- </fileset>
- </unzip>
- <unzip dest="${stagingDirectory}">
-@@ -571,8 +580,8 @@
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
-- <fileset dir="${runtimeLibDirectory}">
-- <include name="commons-cli-*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-cli.jar"/>
- </fileset>
- </unzip>
- <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
-@@ -598,7 +607,7 @@
- description="Build Groovy and create the jarfiles."/>
-
- <target name="updateJarsForOsgi" unless="_skipOsgi_">
-- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
-+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
- <copy todir="${targetDistDirectory}">
- <fileset dir="config/bnd" includes="groovy*.bnd"/>
- <filterset>
-@@ -656,7 +665,6 @@
- <mkdir dir="${installDirectory}/lib"/>
- <copy todir="${installDirectory}/lib">
- <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
-- <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
- </copy>
-
- <!-- Install the embeddable bits -->
-@@ -694,7 +702,7 @@
- </chmod>
- </target>
-
-- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
-+ <target name="checkstyle" depends="-init,-initializeReports"
- description="Create the code style reports.">
- <!-- TODO extend checkstyle to mainSourcePath -->
- <checkAndReport
-@@ -747,7 +755,7 @@
-
- <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
-
-- <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
-+ <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
- unless="_skipDocs_" description="Create the javadoc documentation.">
- <javadoc destdir="${docsDirectory}/api" author="true" version="true"
- windowtitle="${title}" doctitle="${title}"
-@@ -778,15 +786,15 @@
- </copy>
- </target>
-
-- <target name="groovydoc" depends="-fetchDependencies" unless="_skipDocs_">
-+ <target name="groovydoc">
- <path id="groovydocpath">
- <path path="${mainClassesDirectory}"/>
-- <path refid="runtimePath"/>
-+ <path refid="compilePath"/>
- </path>
- <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
- </target>
-
-- <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
-+ <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
- <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
- <classpath>
- <path path="${mainClassesDirectory}"/>
-@@ -812,7 +820,7 @@
- </groovydoc>
- </target>
-
-- <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
-+ <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
- <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
- <classpath>
- <pathelement path="${toolsClassesDirectory}"/>
-@@ -846,7 +854,7 @@
- </delete>
- </target>
-
-- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployDefault,-deployFromServer"
-+ <target name="deploy" depends="install,doc"
- description="Deploy jars to maven repository."/>
-
- <target name="-deployDefault" unless="_forceServerSettings_">
-@@ -867,7 +875,7 @@
- <delete file="target/settings.xml"/>
- </target>
-
-- <target name="installRepo" depends="-mavenInit,install,doc"
-+ <target name="installRepo" depends="install,doc"
- description="Deploy artifacts to local maven repository.">
- <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
- <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
+ </antlr>
+ </target>
+
+- <target name="-init" depends="-fetchDependencies"/>
++ <target name="-init">
++ <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
++ </target>
+
+ <target name="-banner">
+ <echo message="Java Runtime Environment version: ${java.version}"/>
+@@ -429,13 +438,13 @@
+ <fail message="Test failed, not processing further targets."/>
+ </target>
+
+- <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
++ <target name="-coverageInstrument" if="_forceCoverage_">
+ <mkdir dir="${instrumentedClassesDirectory}"/>
+- <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
++ <!--<coberturaInstrument classesDirectory="${mainClassesDirectory}"/>-->
+ </target>
+
+ <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
+- <coberturaReport reportDirectory="${reportsDirectory}/cobertura"/>
++ <!--<coberturaReport reportDirectory="${reportsDirectory}/cobertura"/>-->
+ </target>
+
+ <target name="-actuallyCreateJars"
+@@ -555,12 +564,12 @@
+ <delete dir="${stagingDirectory}" quiet="true"/>
+ <mkdir dir="${stagingDirectory}"/>
+ <unzip dest="${stagingDirectory}">
+- <fileset dir="${runtimeLibDirectory}">
+- <include name="antlr*.jar"/>
+- <include name="asm*.jar"/>
+- <exclude name="asm-attr*.jar"/>
+- <exclude name="asm-util*.jar"/>
+- <exclude name="asm-analysis*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="antlr.jar"/>
++ <include name="asm3.jar"/>
++ <include name="asm3-commons.jar"/>
++ <include name="asm3-tree.jar"/>
++ <include name="asm3-xml.jar"/>
+ </fileset>
+ </unzip>
+ <unzip dest="${stagingDirectory}">
+@@ -580,8 +589,8 @@
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
+- <fileset dir="${runtimeLibDirectory}">
+- <include name="commons-cli-*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-cli.jar"/>
+ </fileset>
+ </unzip>
+ <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
+@@ -607,7 +616,7 @@
+ description="Build Groovy and create the jarfiles."/>
+
+ <target name="updateJarsForOsgi" unless="_skipOsgi_">
+- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
++ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
+ <copy todir="${targetDistDirectory}">
+ <fileset dir="config/bnd" includes="groovy*.bnd"/>
+ <filterset>
+@@ -665,7 +674,6 @@
+ <mkdir dir="${installDirectory}/lib"/>
+ <copy todir="${installDirectory}/lib">
+ <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
+- <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
+ </copy>
+
+ <!-- Install the embeddable bits -->
+@@ -705,7 +713,7 @@
+ </chmod>
+ </target>
+
+- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
++ <target name="checkstyle" depends="-init,-initializeReports"
+ description="Create the code style reports.">
+ <!-- TODO extend checkstyle to mainSourcePath -->
+ <checkAndReport
+@@ -758,7 +766,7 @@
+
+ <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
+
+- <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
++ <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
+ unless="_skipDocs_" description="Create the javadoc documentation.">
+ <javadoc destdir="${docsDirectory}/api" author="true" version="true"
+ windowtitle="${title}" doctitle="${title}"
+@@ -789,15 +797,15 @@
+ </copy>
+ </target>
+
+- <target name="groovydoc" depends="-fetchDependencies" unless="_skipDocs_">
++ <target name="groovydoc">
+ <path id="groovydocpath">
+ <path path="${mainClassesDirectory}"/>
+- <path refid="runtimePath"/>
++ <path refid="compilePath"/>
+ </path>
+ <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
+ </target>
+
+- <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
++ <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
+ <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
+ <classpath>
+ <path path="${mainClassesDirectory}"/>
+@@ -823,7 +831,7 @@
+ </groovydoc>
+ </target>
+
+- <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
++ <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
+ <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
+ <classpath>
+ <pathelement path="${toolsClassesDirectory}"/>
+@@ -857,7 +865,7 @@
+ </delete>
+ </target>
+
+- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployDefault,-deployFromServer"
++ <target name="deploy" depends="install,doc"
+ description="Deploy jars to maven repository."/>
+
+ <target name="-deployDefault" unless="_forceServerSettings_">
+@@ -878,7 +886,7 @@
+ <delete file="target/settings.xml"/>
+ </target>
+
+- <target name="installRepo" depends="-mavenInit,install,doc"
++ <target name="installRepo" depends="install,doc"
+ 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 @@
Modified: trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0003-disable-bnd.diff.patch 2011-10-15 17:00:46 UTC (rev 15201)
+++ trunk/groovy/debian/patches/0003-disable-bnd.diff.patch 2011-10-15 20:26:39 UTC (rev 15202)
@@ -11,13 +11,12 @@
index ab54309..e97dfce 100644
--- a/build.xml
+++ b/build.xml
-@@ -635,7 +635,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
- </move>
- </target>
-
-- <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
-+ <target name="install" depends="createJars,skipOsgi" unless="testFailed"
- description="Create an installation hierarchy in target/install.">
-
- <!--
---
+@@ -644,7 +644,7 @@
+ </move>
+ </target>
+
+- <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
++ <target name="install" depends="createJars,skipOsgi" unless="testFailed"
+ description="Create an installation hierarchy in target/install.">
+
+ <!--
More information about the pkg-java-commits
mailing list