[pkg-java] r12128 - in trunk/groovy/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sun Apr 11 20:22:45 UTC 2010
Author: twerner
Date: 2010-04-11 20:22:44 +0000 (Sun, 11 Apr 2010)
New Revision: 12128
Added:
trunk/groovy/debian/patches/0001-start-scripts.patch
trunk/groovy/debian/patches/0002-ant-build.diff.patch
trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
Removed:
trunk/groovy/debian/patches/ant-build.diff
trunk/groovy/debian/patches/disable-bnd.diff
trunk/groovy/debian/patches/start-scripts.patch
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/control
trunk/groovy/debian/patches/series
Log:
UNRELEASED, FTBFS: needs jansi
* New upstream release
* Change maintainers into Maintainers.
* Update patches and convert them to dep3 format.
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/changelog 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,3 +1,12 @@
+groovy (1.7.2-1) unstable; urgency=low
+
+ UNRELEASED, FTBFS: needs jansi
+ * New upstream release
+ * Change maintainers into Maintainers.
+ * Update patches and convert them to dep3 format.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 11 Apr 2010 22:15:39 +0200
+
groovy (1.7.0-3) unstable; urgency=low
* Replace asm2 with asm3 in debian/maven.rules. (Closes: #571356)
Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/control 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,7 +1,7 @@
Source: groovy
Section: java
Priority: optional
-Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+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>, Ludovic Claude <ludovic.claude at laposte.net>
Build-Depends: debhelper (>= 7), cdbs
Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java,
Added: trunk/groovy/debian/patches/0001-start-scripts.patch
===================================================================
--- trunk/groovy/debian/patches/0001-start-scripts.patch (rev 0)
+++ trunk/groovy/debian/patches/0001-start-scripts.patch 2010-04-11 20:22:44 UTC (rev 12128)
@@ -0,0 +1,44 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:01 +0200
+Subject: [PATCH] start-scripts
+
+===================================================================
+---
+ src/bin/startGroovy | 19 ++-----------------
+ 1 files changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/src/bin/startGroovy b/src/bin/startGroovy
+index 7bf8803..76d1457 100644
+--- a/src/bin/startGroovy
++++ b/src/bin/startGroovy
+@@ -105,27 +105,12 @@ fi
+
+ # Attempt to set GROOVY_HOME if it is not already set.
+ if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then
+- # Resolve links: $0 may be a link to groovy's home.
+- PRG="$0"
+- # Need this for relative symlinks.
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+- SAVED="`pwd`"
+- cd "`dirname \"$PRG\"`/.."
+- GROOVY_HOME="`pwd -P`"
+- cd "$SAVED"
++ GROOVY_HOME="/usr/share/groovy"
+ fi
+
+ # Set the default Groovy config if no specific one is mentioned.
+ if [ -z "$GROOVY_CONF" ] ; then
+- GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
++ GROOVY_CONF="/etc/groovy/groovy-starter.conf"
+ fi
+ STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@"
+
+--
Added: trunk/groovy/debian/patches/0002-ant-build.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0002-ant-build.diff.patch (rev 0)
+++ trunk/groovy/debian/patches/0002-ant-build.diff.patch 2010-04-11 20:22:44 UTC (rev 12128)
@@ -0,0 +1,182 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:03 +0200
+Subject: [PATCH] ant-build.diff
+
+===================================================================
+---
+ build.xml | 53 ++++++++++++++++++++++++-------------------
+ config/ant/build-setup.xml | 1 +
+ 2 files changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index e9a99b0..ab54309 100644
+--- a/build.xml
++++ b/build.xml
+@@ -28,10 +28,17 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <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"/>
+@@ -98,7 +105,9 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </copy>
+ </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}"/>
+@@ -406,13 +415,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <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" sourceDirectory="${mainSourceDirectory}"/>
++ <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
+ </target>
+
+ <target name="-actuallyCreateJars"
+@@ -525,12 +534,12 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <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}">
+@@ -550,8 +559,8 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <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" />
+@@ -575,7 +584,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ 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>
+@@ -631,7 +640,6 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <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 -->
+@@ -669,7 +677,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </chmod>
+ </target>
+
+- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
++ <target name="checkstyle" depends="-init,-initializeReports"
+ description="Create the code style reports.">
+ <checkAndReport
+ reportDirectory="${reportsDirectory}/checkstyle"
+@@ -721,7 +729,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+
+ <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"
+ description="Create the javadoc documentation.">
+ <javadoc destdir="${docsDirectory}/api" author="true" version="true"
+ windowtitle="${title}" doctitle="${title}"
+@@ -748,15 +756,14 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </copy>
+ </target>
+
+- <target name="groovydoc" depends="-fetchDependencies">
++ <target name="groovydoc">
+ <path id="groovydocpath">
+ <path path="${mainClassesDirectory}"/>
+- <path refid="runtimePath"/>
+ </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}"/>
+@@ -781,7 +788,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </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}"/>
+@@ -809,13 +816,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </delete>
+ </target>
+
+- <target name="deploy" depends="-mavenDeployInit,install,doc"
++ <target name="deploy" depends="install,doc"
+ description="Deploy jars to maven repository.">
+ <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
+ <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
+ </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"/>
+diff --git a/config/ant/build-setup.xml b/config/ant/build-setup.xml
+index cd24088..d497e40 100644
+--- a/config/ant/build-setup.xml
++++ b/config/ant/build-setup.xml
+@@ -67,6 +67,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
+ <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
+ <classpath refid="@{classpathref}"/>
+ <jvmarg value="-Duser.home=${user.home}" />
++ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
+ <arg value="@{target}"/>
+ <arg value="-DskipFetch=${skipFetch}"/>
+ <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
+--
Added: trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0003-disable-bnd.diff.patch (rev 0)
+++ trunk/groovy/debian/patches/0003-disable-bnd.diff.patch 2010-04-11 20:22:44 UTC (rev 12128)
@@ -0,0 +1,23 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:05 +0200
+Subject: [PATCH] disable-bnd.diff
+
+===================================================================
+---
+ build.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ab54309..e97dfce 100644
+--- a/build.xml
++++ b/build.xml
+@@ -610,7 +610,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.">
+
+ <!--
+--
Deleted: trunk/groovy/debian/patches/ant-build.diff
===================================================================
--- trunk/groovy/debian/patches/ant-build.diff 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/patches/ant-build.diff 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,172 +0,0 @@
-Index: groovy-1.7.0/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
-@@ -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"/>
-@@ -98,7 +105,9 @@
- </copy>
- </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}"/>
-@@ -408,13 +417,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" sourceDirectory="${mainSourceDirectory}"/>
-+ <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
- </target>
-
- <target name="-actuallyCreateJars"
-@@ -526,12 +535,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}">
-@@ -551,8 +560,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" />
-@@ -576,7 +585,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>
-@@ -632,7 +641,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 -->
-@@ -664,7 +672,7 @@
- </chmod>
- </target>
-
-- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
-+ <target name="checkstyle" depends="-init,-initializeReports"
- description="Create the code style reports.">
- <checkAndReport
- reportDirectory="${reportsDirectory}/checkstyle"
-@@ -716,7 +724,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"
- description="Create the javadoc documentation.">
- <javadoc destdir="${docsDirectory}/api" author="true" version="true"
- windowtitle="${title}" doctitle="${title}"
-@@ -742,16 +750,15 @@
- </copy>
- </target>
-
-- <target name="groovydoc" depends="-fetchDependencies">
-+ <target name="groovydoc">
- <path id="groovydocpath">
- <path path="${mainClassesDirectory}"/>
-- <path refid="runtimePath"/>
- <path path="${java.class.path}"/>
- </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}"/>
-@@ -778,7 +785,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}"/>
-@@ -803,13 +810,13 @@
- </delete>
- </target>
-
-- <target name="deploy" depends="-mavenDeployInit,install,doc"
-+ <target name="deploy" depends="install,doc"
- description="Deploy jars to maven repository.">
- <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
- <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
- </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"/>
-Index: groovy-1.7.0/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
-@@ -67,6 +67,7 @@
- <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
- <classpath refid="@{classpathref}"/>
- <jvmarg value="-Duser.home=${user.home}" />
-+ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
- <arg value="@{target}"/>
- <arg value="-DskipFetch=${skipFetch}"/>
- <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
Deleted: trunk/groovy/debian/patches/disable-bnd.diff
===================================================================
--- trunk/groovy/debian/patches/disable-bnd.diff 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/patches/disable-bnd.diff 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,13 +0,0 @@
-Index: groovy-1.7.0/build.xml
-===================================================================
---- groovy-1.7.0.orig/build.xml 2010-02-17 19:03:15.000000000 -0500
-+++ groovy-1.7.0/build.xml 2010-02-17 19:04:25.000000000 -0500
-@@ -611,7 +611,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.">
-
- <!--
Modified: trunk/groovy/debian/patches/series
===================================================================
--- trunk/groovy/debian/patches/series 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/patches/series 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,3 +1,3 @@
-start-scripts.patch
-ant-build.diff
-disable-bnd.diff
+0001-start-scripts.patch
+0002-ant-build.diff.patch
+0003-disable-bnd.diff.patch
Deleted: trunk/groovy/debian/patches/start-scripts.patch
===================================================================
--- trunk/groovy/debian/patches/start-scripts.patch 2010-04-11 20:00:43 UTC (rev 12127)
+++ trunk/groovy/debian/patches/start-scripts.patch 2010-04-11 20:22:44 UTC (rev 12128)
@@ -1,34 +0,0 @@
-Index: groovy-1.7.0/src/bin/startGroovy
-===================================================================
---- groovy-1.7.0.orig/src/bin/startGroovy 2009-12-09 14:13:38.000000000 -0500
-+++ groovy-1.7.0/src/bin/startGroovy 2010-02-17 18:56:55.000000000 -0500
-@@ -105,27 +105,12 @@
-
- # Attempt to set GROOVY_HOME if it is not already set.
- if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then
-- # Resolve links: $0 may be a link to groovy's home.
-- PRG="$0"
-- # Need this for relative symlinks.
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
-- SAVED="`pwd`"
-- cd "`dirname \"$PRG\"`/.."
-- GROOVY_HOME="`pwd -P`"
-- cd "$SAVED"
-+ GROOVY_HOME="/usr/share/groovy"
- fi
-
- # Set the default Groovy config if no specific one is mentioned.
- if [ -z "$GROOVY_CONF" ] ; then
-- GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
-+ GROOVY_CONF="/etc/groovy/groovy-starter.conf"
- fi
- STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@"
-
More information about the pkg-java-commits
mailing list