Author: nomadium-guest
Date: 2011-08-09 14:44:25 +0000 (Tue, 09 Aug 2011)
New Revision: 14115
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/orig-tar.sh
trunk/groovy/debian/patches/0002-ant-build.diff.patch
trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
trunk/groovy/debian/watch
Log:
* Merge from 1.8 experimental branch.
* Upload to unstable.
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2011-08-09 12:32:11 UTC (rev 14114)
+++ trunk/groovy/debian/changelog 2011-08-09 14:44:25 UTC (rev 14115)
@@ -1,3 +1,16 @@
+groovy (1.8.1-2) UNRELEASED; urgency=low
+
+ * Upload to unstable.
+
+ -- Miguel Landaeta <mig...@miguel.cc> Mon, 08 Aug 2011 21:44:30 -0430
+
+groovy (1.8.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update watch file.
+
+ -- Miguel Landaeta <mig...@miguel.cc> Sun, 24 Jul 2011 11:12:10 +0200
+
groovy (1.7.10-2) unstable; urgency=low
* Add ant-nodeps jar as dep in debian/rules due to changes in Ant 1.8.1.
Modified: trunk/groovy/debian/orig-tar.sh
===================================================================
--- trunk/groovy/debian/orig-tar.sh 2011-08-09 12:32:11 UTC (rev 14114)
+++ trunk/groovy/debian/orig-tar.sh 2011-08-09 14:44:25 UTC (rev 14115)
@@ -2,11 +2,10 @@
# called by uscan with '--upstream-version' <version> <file>
TAR=../groovy_$2.orig.tar.gz
-DIR=groovy-$2.orig
+DIR=groovy-$2
# clean up the upstream tarball
unzip $3
-mv groovy-$2 $DIR
GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.pdf' $DIR
rm -rf $3 $DIR
Modified: trunk/groovy/debian/patches/0002-ant-build.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0002-ant-build.diff.patch 2011-08-09
12:32:11 UTC (rev 14114)
+++ trunk/groovy/debian/patches/0002-ant-build.diff.patch 2011-08-09
14:44:25 UTC (rev 14115)
@@ -1,10 +1,10 @@
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Thu, 05 Aug 2010 13:51:46 -0430
+Date: Thu, 16 Dec 2010 20:45:02 -0430
Subject: [PATCH] ant-build.diff
---- groovy-1.7.3.orig/build.xml
-+++ groovy-1.7.3/build.xml
-@@ -28,10 +28,17 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+--- groovy-1.8.0~beta3.orig/build.xml
++++ groovy-1.8.0~beta3/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. -->
@@ -23,7 +23,7 @@
<condition property="_skipTests_">
<or>
<equals arg1="${test}" arg2="false"/>
-@@ -96,7 +103,9 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -96,7 +103,9 @@
</antlr>
</target>
@@ -34,7 +34,7 @@
<target name="-banner">
<echo message="Java Runtime Environment version: ${java.version}"/>
-@@ -408,13 +417,13 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -422,13 +431,13 @@
<fail message="Test failed, not processing further targets."/>
</target>
@@ -42,16 +42,16 @@
+ <target name="-coverageInstrument" if="_forceCoverage_">
<mkdir dir="${instrumentedClassesDirectory}"/>
- <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
-+ <!--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}"/-->
+- <coberturaReport reportDirectory="${reportsDirectory}/cobertura"/>
++ <!--<coberturaReport
reportDirectory="${reportsDirectory}/cobertura"/>-->
</target>
<target name="-actuallyCreateJars"
-@@ -527,12 +536,12 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -546,12 +555,12 @@
<delete dir="${stagingDirectory}" quiet="true"/>
<mkdir dir="${stagingDirectory}"/>
<unzip dest="${stagingDirectory}">
@@ -70,7 +70,7 @@
</fileset>
</unzip>
<unzip dest="${stagingDirectory}">
-@@ -552,8 +561,8 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -571,8 +580,8 @@
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
<globmapper from="META-INF/LICENSE.txt"
to="META-INF/CLI-LICENSE.txt"/>
@@ -81,7 +81,7 @@
</fileset>
</unzip>
<makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
-@@ -579,7 +588,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -598,7 +607,7 @@
description="Build Groovy and create the jarfiles."/>
<target name="updateJarsForOsgi" unless="_skipOsgi_">
@@ -90,7 +90,7 @@
<copy todir="${targetDistDirectory}">
<fileset dir="config/bnd" includes="groovy*.bnd"/>
<filterset>
-@@ -637,7 +646,6 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -656,7 +665,6 @@
<mkdir dir="${installDirectory}/lib"/>
<copy todir="${installDirectory}/lib">
<fileset dir="${targetDistDirectory}"
includes="groovy-${groovyVersion}.jar"/>
@@ -98,16 +98,16 @@
</copy>
<!-- Install the embeddable bits -->
-@@ -675,7 +683,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -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
- reportDirectory="${reportsDirectory}/checkstyle"
-@@ -727,7 +735,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -747,7 +755,7 @@
<target name="doc" depends="javadoc, groovydoc" description="Create the
documentation."/>
@@ -116,7 +116,7 @@
unless="_skipDocs_" description="Create the javadoc
documentation.">
<javadoc destdir="${docsDirectory}/api" author="true" version="true"
windowtitle="${title}" doctitle="${title}"
-@@ -755,15 +763,15 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -778,15 +786,15 @@
</copy>
</target>
@@ -135,7 +135,7 @@
<taskdef name="groovydoc"
classname="org.codehaus.groovy.ant.Groovydoc">
<classpath>
<path path="${mainClassesDirectory}"/>
-@@ -789,7 +797,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -812,7 +820,7 @@
</groovydoc>
</target>
@@ -144,7 +144,7 @@
<java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes"
failonerror="true">
<classpath>
<pathelement path="${toolsClassesDirectory}"/>
-@@ -821,7 +829,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -846,7 +854,7 @@
</delete>
</target>
@@ -153,7 +153,7 @@
description="Deploy jars to maven repository."/>
<target name="-deployDefault" unless="_forceServerSettings_">
-@@ -842,7 +850,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+@@ -867,7 +875,7 @@
<delete file="target/settings.xml"/>
</target>
@@ -162,9 +162,9 @@
description="Deploy artifacts to local maven repository.">
<mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
<mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
---- groovy-1.7.3.orig/config/ant/build-setup.xml
-+++ groovy-1.7.3/config/ant/build-setup.xml
-@@ -67,6 +67,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 1
+--- 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 @@
<java classname="org.apache.tools.ant.launch.Launcher"
fork="true" maxmemory="@{maxmemory}" failonerror="true">
<classpath refid="@{classpathref}"/>
<jvmarg value="-Duser.home=${user.home}" />
Modified: trunk/groovy/debian/patches/0003-disable-bnd.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0003-disable-bnd.diff.patch 2011-08-09
12:32:11 UTC (rev 14114)
+++ trunk/groovy/debian/patches/0003-disable-bnd.diff.patch 2011-08-09
14:44:25 UTC (rev 14115)
@@ -11,7 +11,7 @@
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) $
+@@ -635,7 +635,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
</move>
</target>
Modified: trunk/groovy/debian/watch
===================================================================
--- trunk/groovy/debian/watch 2011-08-09 12:32:11 UTC (rev 14114)
+++ trunk/groovy/debian/watch 2011-08-09 14:44:25 UTC (rev 14115)
@@ -1,2 +1,2 @@
version=3
-http://dist.groovy.codehaus.org/distributions/ groovy-src-(.*).zip debian
debian/orig-tar.sh
+http://dist.groovy.codehaus.org/distributions/ groovy-src-(.*1\.8.*).zip
debian debian/orig-tar.sh
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
