Author: varun Date: 2010-02-18 02:09:39 +0000 (Thu, 18 Feb 2010) New Revision: 11618
Added: trunk/groovy/debian/source/ trunk/groovy/debian/source/format Removed: trunk/groovy/debian/README.source Modified: trunk/groovy/debian/changelog trunk/groovy/debian/control trunk/groovy/debian/grape.1 trunk/groovy/debian/patches/ant-build.diff trunk/groovy/debian/patches/disable-bnd.diff trunk/groovy/debian/patches/start-scripts.patch trunk/groovy/debian/rules Log: * New upstream release * Switch to source format 3.0 (quilt) * debian/control: - Switch to default-jdk - Replace Build-Depends: libasm2* with libasm3* - Bump Standards-Version to 3.8.4 * Update all the patches Deleted: trunk/groovy/debian/README.source =================================================================== --- trunk/groovy/debian/README.source 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/README.source 2010-02-18 02:09:39 UTC (rev 11618) @@ -1,9 +0,0 @@ -Patch System -============ - -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. - Modified: trunk/groovy/debian/changelog =================================================================== --- trunk/groovy/debian/changelog 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/changelog 2010-02-18 02:09:39 UTC (rev 11618) @@ -1,3 +1,15 @@ +groovy (1.7.0-1) unstable; urgency=low + + * New upstream release + * Switch to source format 3.0 (quilt) + * debian/control: + - Switch to default-jdk + - Replace Build-Depends: libasm2* with libasm3* + - Bump Standards-Version to 3.8.4 + * Update all the patches + + -- Varun Hiremath <[email protected]> Wed, 17 Feb 2010 18:25:49 -0500 + groovy (1.6.4-4) unstable; urgency=low [ Varun Hiremath ] @@ -74,7 +86,7 @@ [ Varun Hiremath ] * Fix build.xml file * Add ivy to Build-Depends - * Remove unnecessary Depends -- collections3, mx4j and xpp3 + * Remove unnecessary Depends -- collections3, mx4j and xpp3 * Add build.diff patch to fix a build error * Use quilt to manage patches * Update manpage (Closes: #507862) Modified: trunk/groovy/debian/control =================================================================== --- trunk/groovy/debian/control 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/control 2010-02-18 02:09:39 UTC (rev 11618) @@ -3,24 +3,24 @@ Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]>, Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 6), cdbs, quilt -Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, openjdk-6-jdk, bzip2, libasm2-java, +Build-Depends: debhelper (>= 7), cdbs +Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java, libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>= 1.2), libservlet2.4-java, libxstream-java, libjline-java, antlr, tofrodos, ivy, libqdox-java, libjarjar-java -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://groovy.codehaus.org/ -Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/groovy/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy/ Package: groovy Architecture: all -Depends: ${misc:Depends}, antlr, libasm2-java, libbsf-java, +Depends: ${misc:Depends}, antlr, libasm3-java, libbsf-java, libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0), libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>= 1.2), libservlet2.4-java, libjline-java, - libxstream-java, ivy, openjdk-6-jre-headless | java5-runtime-headless + libxstream-java, ivy, default-jre-headless | java5-runtime-headless Suggests: groovy-doc, ant (>= 1.7.1) Description: Agile dynamic language for the Java Virtual Machine Groovy is an agile dynamic language for the JVM combining lots of great Modified: trunk/groovy/debian/grape.1 =================================================================== --- trunk/groovy/debian/grape.1 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/grape.1 2010-02-18 02:09:39 UTC (rev 11618) @@ -42,7 +42,7 @@ \fBresolve\fR (<groupId> <artifactId> <version>)+: This returns the file locations of the jars representing the artifcats for the specified module(s) and the respective transitive dependencies. -You may optionally pass in -ant, -dos, or -shell to get the dependencies +You may optionally pass in \-ant, \-dos, or \-shell to get the dependencies expressed in a format applicable for an ant script, windows batch file, or unix shell script respectively. .SH "SEE ALSO" Modified: trunk/groovy/debian/patches/ant-build.diff =================================================================== --- trunk/groovy/debian/patches/ant-build.diff 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/patches/ant-build.diff 2010-02-18 02:09:39 UTC (rev 11618) @@ -1,27 +1,27 @@ ---- a/build.xml -+++ b/build.xml -@@ -28,10 +28,18 @@ +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-maven.xml"/> <import file="config/ant/build-checkstyle.xml"/> <import file="config/ant/build-cobertura.xml"/> -- <import file="config/ant/build-retro.xml"/> -+ <import file="config/ant/build-retro.xml"/--> -+ + + <path id="compilePath"> + <path path="${java.class.path}" /> + </path> + <path id="toolsPath"> + <path path="${java.class.path}" /> + </path> - ++ <condition property="_skipTests_"> <or> -@@ -96,7 +104,9 @@ + <equals arg1="${test}" arg2="false"/> +@@ -98,7 +105,9 @@ </copy> </target> @@ -32,7 +32,7 @@ <target name="-banner"> <echo message="Java Runtime Environment version: ${java.version}"/> -@@ -455,13 +465,13 @@ +@@ -408,13 +417,13 @@ <fail message="Test failed, not processing further targets."/> </target> @@ -49,7 +49,7 @@ </target> <target name="-actuallyCreateJars" -@@ -559,12 +569,12 @@ +@@ -526,12 +535,12 @@ <delete dir="${stagingDirectory}" quiet="true"/> <mkdir dir="${stagingDirectory}"/> <unzip dest="${stagingDirectory}"> @@ -68,7 +68,7 @@ </fileset> </unzip> <unzip dest="${stagingDirectory}"> -@@ -584,8 +594,8 @@ +@@ -551,8 +560,8 @@ <exclude name="META-INF/MANIFEST.MF"/> </patternset> <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/> @@ -79,16 +79,16 @@ </fileset> </unzip> <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" /> -@@ -657,7 +667,7 @@ - </target> +@@ -576,7 +585,7 @@ + description="Build Groovy and create the jarfiles."/> - <target name="updateJarsForOsgi"> + <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> -@@ -706,7 +716,6 @@ +@@ -632,7 +641,6 @@ <mkdir dir="${installDirectory}/lib"/> <copy todir="${installDirectory}/lib"> <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/> @@ -96,22 +96,16 @@ </copy> <!-- Install the embeddable bits --> -@@ -738,12 +747,12 @@ +@@ -664,7 +672,7 @@ </chmod> </target> -- <target name="translate" depends="-retroInit" if="_forceRetro_"> -+ <target name="translate" if="_forceRetro_"> - <retroArtifact basedir="${targetDistDirectory}" artifact="groovy"/> - <retroArtifact basedir="${targetDistDirectory}" artifact="groovy-all"/> - </target> - - <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit" + <target name="checkstyle" depends="-init,-initializeReports" description="Create the code style reports."> <checkAndReport reportDirectory="${reportsDirectory}/checkstyle" -@@ -795,7 +804,7 @@ +@@ -716,7 +724,7 @@ <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> @@ -120,7 +114,7 @@ description="Create the javadoc documentation."> <javadoc destdir="${docsDirectory}/api" author="true" version="true" windowtitle="${title}" doctitle="${title}" -@@ -831,16 +840,15 @@ +@@ -742,16 +750,15 @@ </copy> </target> @@ -139,7 +133,7 @@ <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"> <classpath> <path path="${mainClassesDirectory}"/> -@@ -867,7 +875,7 @@ +@@ -778,7 +785,7 @@ </groovydoc> </target> @@ -148,17 +142,15 @@ <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true"> <classpath> <pathelement path="${toolsClassesDirectory}"/> -@@ -892,7 +900,7 @@ +@@ -803,13 +810,13 @@ </delete> </target> -- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployPlainOnly,-deployPlainAndRetro" -+ <target name="deploy" depends="install,doc,-deployPlainOnly,-deployPlainAndRetro" - description="Deploy jars to maven repository."/> - - <target name="-deployPlainOnly" unless="_forceRetro_"> -@@ -912,7 +920,7 @@ - <mavenDeploy version="${groovyVersion}" prefix="groovy-all-jdk14"/> +- <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" @@ -166,13 +158,15 @@ description="Deploy artifacts to local maven repository."> <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> ---- a/config/ant/build-setup.xml -+++ b/config/ant/build-setup.xml -@@ -66,6 +66,7 @@ - <sequential> +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}"/> - </java> - </sequential> + <arg value="-DskipFetch=${skipFetch}"/> + <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/> Modified: trunk/groovy/debian/patches/disable-bnd.diff =================================================================== --- trunk/groovy/debian/patches/disable-bnd.diff 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/patches/disable-bnd.diff 2010-02-18 02:09:39 UTC (rev 11618) @@ -1,13 +1,13 @@ -Index: groovy-1.6.4/build.xml +Index: groovy-1.7.0/build.xml =================================================================== ---- groovy-1.6.4.orig/build.xml 2009-09-17 16:41:18.000000000 +0200 -+++ groovy-1.6.4/build.xml 2009-09-17 16:41:33.000000000 +0200 -@@ -686,7 +686,7 @@ - <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/> +--- 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,translate,updateRetroJars,updateJarsForOsgi" unless="testFailed" -+ <target name="install" depends="createJars,translate,updateRetroJars" unless="testFailed" +- <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/start-scripts.patch =================================================================== --- trunk/groovy/debian/patches/start-scripts.patch 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/patches/start-scripts.patch 2010-02-18 02:09:39 UTC (rev 11618) @@ -1,5 +1,7 @@ ---- a/src/bin/startGroovy -+++ b/src/bin/startGroovy +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. Modified: trunk/groovy/debian/rules =================================================================== --- trunk/groovy/debian/rules 2010-02-17 23:17:13 UTC (rev 11617) +++ trunk/groovy/debian/rules 2010-02-18 02:09:39 UTC (rev 11618) @@ -2,17 +2,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_ANT_BUILDFILE := build.xml +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := build.xml DEB_ANT_BUILD_TARGET := install doc -DEB_ANT_ARGS := -debug -DskipTests=true -DskipFetch=true +DEB_ANT_ARGS := -debug -DskipTests=true -DskipFetch=true DEB_JARS := ant mockobjects-core servlet-api jsp-api commons-cli antlr \ - ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm2 \ - asm2-util asm2-tree asm2-analysis ivy bnd qdox jarjar + ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm3 \ + asm3-util asm3-tree asm3-analysis ivy bnd qdox jarjar API_DOCS := target/html/api binary-post-install/$(PACKAGE):: Added: trunk/groovy/debian/source/format =================================================================== --- trunk/groovy/debian/source/format (rev 0) +++ trunk/groovy/debian/source/format 2010-02-18 02:09:39 UTC (rev 11618) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
