[pkg-java] r10051 - in trunk/groovy/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-14 21:35:53 +0000 (Fri, 14 Aug 2009)
New Revision: 10051

Added:
   trunk/groovy/debian/patches/start-scripts.patch
Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/patches/series
Log:
Patch startGroovy to use Debian paths (Closes: #540688)

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2009-08-14 17:07:44 UTC (rev 10050)
+++ trunk/groovy/debian/changelog	2009-08-14 21:35:53 UTC (rev 10051)
@@ -1,3 +1,9 @@
+groovy (1.6.4-3) unstable; urgency=low
+
+  * Patch startGroovy to use Debian paths (Closes: #540688)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  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)

Modified: trunk/groovy/debian/patches/series
===================================================================
--- trunk/groovy/debian/patches/series	2009-08-14 17:07:44 UTC (rev 10050)
+++ trunk/groovy/debian/patches/series	2009-08-14 21:35:53 UTC (rev 10051)
@@ -1 +1,2 @@
+start-scripts.patch
 ant-build.diff

Added: trunk/groovy/debian/patches/start-scripts.patch
===================================================================
--- trunk/groovy/debian/patches/start-scripts.patch	                        (rev 0)
+++ trunk/groovy/debian/patches/start-scripts.patch	2009-08-14 21:35:53 UTC (rev 10051)
@@ -0,0 +1,32 @@
+--- a/src/bin/startGroovy
++++ b/src/bin/startGroovy
+@@ -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@"
+