Author: twerner Date: 2010-09-02 21:30:10 +0000 (Thu, 02 Sep 2010) New Revision: 12957
Added: tags/1.7.0-4/ tags/1.7.0-4/debian/changelog tags/1.7.0-4/debian/patches/start-scripts.patch Removed: tags/1.7.0-4/debian/changelog tags/1.7.0-4/debian/patches/start-scripts.patch Log: [svn-buildpackage] Tagging groovy 1.7.0-4 Deleted: tags/1.7.0-4/debian/changelog =================================================================== --- branches/groovy/testing/debian/changelog 2010-09-02 21:04:22 UTC (rev 12955) +++ tags/1.7.0-4/debian/changelog 2010-09-02 21:30:10 UTC (rev 12957) @@ -1,244 +0,0 @@ -groovy (1.7.0-3) unstable; urgency=low - - * Replace asm2 with asm3 in debian/maven.rules. (Closes: #571356) - - -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 11:33:39 +0100 - -groovy (1.7.0-2) unstable; urgency=low - - * Replace asm2 with asm3 in debian/groovy.links (Closes: #571369) - * Replace asm2 with asm3 in patches/ant-build.diff - - -- Varun Hiremath <[email protected]> Fri, 26 Feb 2010 16:39:51 -0500 - -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 ] - * Fix debian/copyright file (Closes: #543565) - * Bump Standards-Version to 3.8.3 - - [ Torsten Werner ] - * Remove Build-Depends: bnd and add a patch disable-bn.diff because bnd is - not ready for main yet. (Closes: #543130) - - -- Torsten Werner <[email protected]> Wed, 16 Sep 2009 13:25:12 +0200 - -groovy (1.6.4-3) unstable; urgency=low - - * Patch startGroovy to use Debian paths (Closes: #540688) - - -- Ludovic Claude <[email protected]> Fri, 14 Aug 2009 14:26:04 +0100 - -groovy (1.6.4-2) unstable; urgency=low - - * Update Depends: libcommons-cli-java (>= 1.2). (Closes: #530623) - - -- Torsten Werner <[email protected]> Sun, 09 Aug 2009 11:24:02 +0200 - -groovy (1.6.4-1) experimental; urgency=low - - * New upstream release - * Add myself to Uploaders - * Fix classpath for bnd task in the build - * Add ant to Suggests: for the groovy package as - Ant can be embedded in some Groovy scripts - - -- Ludovic Claude <[email protected]> Sun, 02 Aug 2009 23:12:29 +0100 - -groovy (1.6.3-2) experimental; urgency=low - - * Change the section to java - * Update the build to use most of the original ant build script - * Remove build.diff patch as it is not useful anymore. - * Use BND to add the OSGi metadata to the jar. - * Add bnd, libqdox-java, libjarjar-java to Build-Depends - * Link ivy.jar into the Groovy lib folder (Closes: #526472) - * Add Build-Depends on maven-repo-helper - * Deploy groovy jars into the Maven repository - * Add embeddable jar groovy-all.jar - * Add the Groovy documentation (gapi) and the Groovy changes - to the JDK (groovy-jdk) specification. - * Move the classloader configuration to /etc/groovy. - * Bump Standards-Version to 3.8.2: - - Add a README.source to describe patch system - - move API documentation to /usr/share/doc/groovy/api - - -- Ludovic Claude <[email protected]> Fri, 17 Jul 2009 00:33:18 +0100 - -groovy (1.6.3-1) unstable; urgency=low - - * New upstream release - - -- Torsten Werner <[email protected]> Tue, 19 May 2009 21:49:37 +0200 - -groovy (1.6.2-1) unstable; urgency=low - - * New upstream release - - -- Varun Hiremath <[email protected]> Wed, 06 May 2009 14:05:59 -0400 - -groovy (1.6.0-1) unstable; urgency=low - - [ Torsten Werner ] - * New upstream release (Closes: #521648) - * Remove Build-Depends: libclassworlds-java. - * Switch to source and target version 1.5. - - [ Varun Hiremath ] - * Fix build.xml file - * Add ivy to Build-Depends - * 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) - - -- Varun Hiremath <[email protected]> Wed, 01 Apr 2009 19:24:19 -0400 - -groovy (1.5.7-1) unstable; urgency=low - - * New upstream release - - -- Torsten Werner <[email protected]> Thu, 04 Dec 2008 11:15:20 +0100 - -groovy (1.5.6-2) unstable; urgency=low - - * Build the package with openjdk-6-jdk now. - * Move package to main. - * Change Depends: openjdk-6-jre-headless | java5-runtime-headless. - * Bump up Standards-Version: 3.8.0 (no changes needed). - - -- Torsten Werner <[email protected]> Mon, 11 Aug 2008 19:21:53 +0200 - -groovy (1.5.6-1) unstable; urgency=low - - * New upstream release - - -- Varun Hiremath <[email protected]> Thu, 01 May 2008 10:40:25 +0530 - -groovy (1.5.5-1) unstable; urgency=low - - * New upstream release - - -- Varun Hiremath <[email protected]> Mon, 14 Apr 2008 14:53:28 +0530 - -groovy (1.5.4-1) unstable; urgency=low - - * New upstream release - - -- Varun Hiremath <[email protected]> Sun, 10 Feb 2008 17:29:48 +0530 - -groovy (1.5.2-1) unstable; urgency=low - - * New upstream release - * Add antlr to Build-Depends-Indep and groovy Depends (Closes: #463147) - * Bump debhelper compat to 6 - - -- Varun Hiremath <[email protected]> Wed, 30 Jan 2008 09:41:16 +0530 - -groovy (1.5.1-1) unstable; urgency=low - - * New upstream release - * Fix hyphens in groovy manpage - - -- Varun Hiremath <[email protected]> Sat, 05 Jan 2008 03:42:21 +0530 - -groovy (1.5.0-2) unstable; urgency=low - - * Set source=1.4 and target=1.4 for javac. (Closes: #458001) - - -- Torsten Werner <[email protected]> Fri, 28 Dec 2007 12:58:00 +0100 - -groovy (1.5.0-1) unstable; urgency=low - - [ Varun Hiremath ] - * New upstream release (Closes: #367010) - * debian/control: - + Set Debian Java maintainers as Maintainer (Closes: #382815) - + Add myself and Torsten to Uploaders - + Add sun-java6-jdk, libxstream-java to Build-Depends - + Add Homepage, Vcs-{Svn, Browser} headers - + Bump up the Standards-Version to 3.7.3 - + Add Suggests for the binary and doc packages - * Add debian/watch, debian/orig-tar.sh to create orig.tar.gz - * Write a new debian/build.xml and add debian/ant.properties - * debian/rules: - + call javadoc to build docs - + use sun-java6-jdk to build - * Clean up javadoc installation. - * Add some missing links in debian/groovy.links - * Add manpages - - [ Torsten Werner ] - * Switch to libservlet2.4-java. - * Add Build-Depends: libjline-java. - * Remove the (binary only) PDF file from orig.tar.gz. - - -- Torsten Werner <[email protected]> Sat, 15 Dec 2007 15:21:00 +0100 - -groovy (0.1.0beta10-3) unstable; urgency=low - - * Fixed dependencies to ant after ant reorganisation into main. - (closes: #331647) - - -- Marcus Crafter <[email protected]> Tue, 18 Oct 2005 12:35:43 +0200 - -groovy (0.1.0beta10-2) unstable; urgency=low - - * Added missing dependency to bzip2. Thanks for Andreas Jochens - <[email protected]> for the bug report. - (closes: #302574) - - -- Marcus Crafter <[email protected]> Sat, 2 Apr 2005 20:32:48 +0200 - -groovy (0.1.0beta10-1) unstable; urgency=low - - * New upstream release - - -- Marcus Crafter <[email protected]> Wed, 9 Mar 2005 17:11:18 +0100 - -groovy (0.1.0beta8-4) unstable; urgency=low - - * Improved website mirror in groovy-doc package by increasing the mirrored - link depth to 2. This catches many more articles from the Groovy wiki - which would be of interest for offline reading. - * Fixed broken doc-base links, added doc-base link for the website mirror. - * Added examples. - - -- Marcus Crafter <[email protected]> Mon, 3 Jan 2005 21:34:18 +0100 - -groovy (0.1.0beta8-3) unstable; urgency=low - - * Added a shallow copy of the Groovy website to the groovy-doc package, - which contains various articles, language references and documents for - offline use. Rearranged javadoc generation to fit in with the website. - - -- Marcus Crafter <[email protected]> Mon, 3 Jan 2005 00:37:10 +0100 - -groovy (0.1.0beta8-2) unstable; urgency=low - - * Updated build to include Groovy API javadoc, and Groovy JDK - documentation. - * Split package into a software and documentation package. - * Added doc-base details for groovy-doc package for the javadocs and - groovy API. - - -- Marcus Crafter <[email protected]> Sun, 2 Jan 2005 14:33:52 +0100 - -groovy (0.1.0beta8-1) unstable; urgency=low - - * Initial Release. - (closes: #268029) - - -- Marcus Crafter <[email protected]> Sat, 18 Dec 2004 22:45:06 +0100 Copied: tags/1.7.0-4/debian/changelog (from rev 12956, branches/groovy/testing/debian/changelog) =================================================================== --- tags/1.7.0-4/debian/changelog (rev 0) +++ tags/1.7.0-4/debian/changelog 2010-09-02 21:30:10 UTC (rev 12957) @@ -0,0 +1,250 @@ +groovy (1.7.0-4) testing; urgency=low + + * Set $JAVA_HOME in startGroovy. (Closes: #580160) + + -- Torsten Werner <[email protected]> Thu, 02 Sep 2010 23:24:39 +0200 + +groovy (1.7.0-3) unstable; urgency=low + + * Replace asm2 with asm3 in debian/maven.rules. (Closes: #571356) + + -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 11:33:39 +0100 + +groovy (1.7.0-2) unstable; urgency=low + + * Replace asm2 with asm3 in debian/groovy.links (Closes: #571369) + * Replace asm2 with asm3 in patches/ant-build.diff + + -- Varun Hiremath <[email protected]> Fri, 26 Feb 2010 16:39:51 -0500 + +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 ] + * Fix debian/copyright file (Closes: #543565) + * Bump Standards-Version to 3.8.3 + + [ Torsten Werner ] + * Remove Build-Depends: bnd and add a patch disable-bn.diff because bnd is + not ready for main yet. (Closes: #543130) + + -- Torsten Werner <[email protected]> Wed, 16 Sep 2009 13:25:12 +0200 + +groovy (1.6.4-3) unstable; urgency=low + + * Patch startGroovy to use Debian paths (Closes: #540688) + + -- Ludovic Claude <[email protected]> Fri, 14 Aug 2009 14:26:04 +0100 + +groovy (1.6.4-2) unstable; urgency=low + + * Update Depends: libcommons-cli-java (>= 1.2). (Closes: #530623) + + -- Torsten Werner <[email protected]> Sun, 09 Aug 2009 11:24:02 +0200 + +groovy (1.6.4-1) experimental; urgency=low + + * New upstream release + * Add myself to Uploaders + * Fix classpath for bnd task in the build + * Add ant to Suggests: for the groovy package as + Ant can be embedded in some Groovy scripts + + -- Ludovic Claude <[email protected]> Sun, 02 Aug 2009 23:12:29 +0100 + +groovy (1.6.3-2) experimental; urgency=low + + * Change the section to java + * Update the build to use most of the original ant build script + * Remove build.diff patch as it is not useful anymore. + * Use BND to add the OSGi metadata to the jar. + * Add bnd, libqdox-java, libjarjar-java to Build-Depends + * Link ivy.jar into the Groovy lib folder (Closes: #526472) + * Add Build-Depends on maven-repo-helper + * Deploy groovy jars into the Maven repository + * Add embeddable jar groovy-all.jar + * Add the Groovy documentation (gapi) and the Groovy changes + to the JDK (groovy-jdk) specification. + * Move the classloader configuration to /etc/groovy. + * Bump Standards-Version to 3.8.2: + - Add a README.source to describe patch system + - move API documentation to /usr/share/doc/groovy/api + + -- Ludovic Claude <[email protected]> Fri, 17 Jul 2009 00:33:18 +0100 + +groovy (1.6.3-1) unstable; urgency=low + + * New upstream release + + -- Torsten Werner <[email protected]> Tue, 19 May 2009 21:49:37 +0200 + +groovy (1.6.2-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Wed, 06 May 2009 14:05:59 -0400 + +groovy (1.6.0-1) unstable; urgency=low + + [ Torsten Werner ] + * New upstream release (Closes: #521648) + * Remove Build-Depends: libclassworlds-java. + * Switch to source and target version 1.5. + + [ Varun Hiremath ] + * Fix build.xml file + * Add ivy to Build-Depends + * 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) + + -- Varun Hiremath <[email protected]> Wed, 01 Apr 2009 19:24:19 -0400 + +groovy (1.5.7-1) unstable; urgency=low + + * New upstream release + + -- Torsten Werner <[email protected]> Thu, 04 Dec 2008 11:15:20 +0100 + +groovy (1.5.6-2) unstable; urgency=low + + * Build the package with openjdk-6-jdk now. + * Move package to main. + * Change Depends: openjdk-6-jre-headless | java5-runtime-headless. + * Bump up Standards-Version: 3.8.0 (no changes needed). + + -- Torsten Werner <[email protected]> Mon, 11 Aug 2008 19:21:53 +0200 + +groovy (1.5.6-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Thu, 01 May 2008 10:40:25 +0530 + +groovy (1.5.5-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Mon, 14 Apr 2008 14:53:28 +0530 + +groovy (1.5.4-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Sun, 10 Feb 2008 17:29:48 +0530 + +groovy (1.5.2-1) unstable; urgency=low + + * New upstream release + * Add antlr to Build-Depends-Indep and groovy Depends (Closes: #463147) + * Bump debhelper compat to 6 + + -- Varun Hiremath <[email protected]> Wed, 30 Jan 2008 09:41:16 +0530 + +groovy (1.5.1-1) unstable; urgency=low + + * New upstream release + * Fix hyphens in groovy manpage + + -- Varun Hiremath <[email protected]> Sat, 05 Jan 2008 03:42:21 +0530 + +groovy (1.5.0-2) unstable; urgency=low + + * Set source=1.4 and target=1.4 for javac. (Closes: #458001) + + -- Torsten Werner <[email protected]> Fri, 28 Dec 2007 12:58:00 +0100 + +groovy (1.5.0-1) unstable; urgency=low + + [ Varun Hiremath ] + * New upstream release (Closes: #367010) + * debian/control: + + Set Debian Java maintainers as Maintainer (Closes: #382815) + + Add myself and Torsten to Uploaders + + Add sun-java6-jdk, libxstream-java to Build-Depends + + Add Homepage, Vcs-{Svn, Browser} headers + + Bump up the Standards-Version to 3.7.3 + + Add Suggests for the binary and doc packages + * Add debian/watch, debian/orig-tar.sh to create orig.tar.gz + * Write a new debian/build.xml and add debian/ant.properties + * debian/rules: + + call javadoc to build docs + + use sun-java6-jdk to build + * Clean up javadoc installation. + * Add some missing links in debian/groovy.links + * Add manpages + + [ Torsten Werner ] + * Switch to libservlet2.4-java. + * Add Build-Depends: libjline-java. + * Remove the (binary only) PDF file from orig.tar.gz. + + -- Torsten Werner <[email protected]> Sat, 15 Dec 2007 15:21:00 +0100 + +groovy (0.1.0beta10-3) unstable; urgency=low + + * Fixed dependencies to ant after ant reorganisation into main. + (closes: #331647) + + -- Marcus Crafter <[email protected]> Tue, 18 Oct 2005 12:35:43 +0200 + +groovy (0.1.0beta10-2) unstable; urgency=low + + * Added missing dependency to bzip2. Thanks for Andreas Jochens + <[email protected]> for the bug report. + (closes: #302574) + + -- Marcus Crafter <[email protected]> Sat, 2 Apr 2005 20:32:48 +0200 + +groovy (0.1.0beta10-1) unstable; urgency=low + + * New upstream release + + -- Marcus Crafter <[email protected]> Wed, 9 Mar 2005 17:11:18 +0100 + +groovy (0.1.0beta8-4) unstable; urgency=low + + * Improved website mirror in groovy-doc package by increasing the mirrored + link depth to 2. This catches many more articles from the Groovy wiki + which would be of interest for offline reading. + * Fixed broken doc-base links, added doc-base link for the website mirror. + * Added examples. + + -- Marcus Crafter <[email protected]> Mon, 3 Jan 2005 21:34:18 +0100 + +groovy (0.1.0beta8-3) unstable; urgency=low + + * Added a shallow copy of the Groovy website to the groovy-doc package, + which contains various articles, language references and documents for + offline use. Rearranged javadoc generation to fit in with the website. + + -- Marcus Crafter <[email protected]> Mon, 3 Jan 2005 00:37:10 +0100 + +groovy (0.1.0beta8-2) unstable; urgency=low + + * Updated build to include Groovy API javadoc, and Groovy JDK + documentation. + * Split package into a software and documentation package. + * Added doc-base details for groovy-doc package for the javadocs and + groovy API. + + -- Marcus Crafter <[email protected]> Sun, 2 Jan 2005 14:33:52 +0100 + +groovy (0.1.0beta8-1) unstable; urgency=low + + * Initial Release. + (closes: #268029) + + -- Marcus Crafter <[email protected]> Sat, 18 Dec 2004 22:45:06 +0100 Deleted: tags/1.7.0-4/debian/patches/start-scripts.patch =================================================================== --- branches/groovy/testing/debian/patches/start-scripts.patch 2010-09-02 21:04:22 UTC (rev 12955) +++ tags/1.7.0-4/debian/patches/start-scripts.patch 2010-09-02 21:30:10 UTC (rev 12957) @@ -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@" - Copied: tags/1.7.0-4/debian/patches/start-scripts.patch (from rev 12956, branches/groovy/testing/debian/patches/start-scripts.patch) =================================================================== --- tags/1.7.0-4/debian/patches/start-scripts.patch (rev 0) +++ tags/1.7.0-4/debian/patches/start-scripts.patch 2010-09-02 21:30:10 UTC (rev 12957) @@ -0,0 +1,43 @@ +Index: groovy-1.7.0/src/bin/startGroovy +=================================================================== +--- a/src/bin/startGroovy ++++ b/src/bin/startGroovy +@@ -65,6 +65,8 @@ if [ "$1" = "-cp" -o "$1" = "-classpath" ] ; then + shift 2 + fi + ++export JAVA_HOME="${JAVA_HOME:-/usr/lib/jvm/default-java}" ++ + # Attempt to set JAVA_HOME if it's not already set. + if [ -z "$JAVA_HOME" ] ; then + if $darwin ; then +@@ -105,27 +107,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@" + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
