[pkg-java] r12956 - in branches/groovy/testing/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2010-09-02 21:25:55 +0000 (Thu, 02 Sep 2010)
New Revision: 12956

Modified:
   branches/groovy/testing/debian/changelog
   branches/groovy/testing/debian/patches/start-scripts.patch
Log:
Set $JAVA_HOME in startGroovy. (Closes: #580160)

Modified: branches/groovy/testing/debian/changelog
===================================================================
--- branches/groovy/testing/debian/changelog	2010-09-02 21:04:22 UTC (rev 12955)
+++ branches/groovy/testing/debian/changelog	2010-09-02 21:25:55 UTC (rev 12956)
@@ -1,3 +1,9 @@
+groovy (1.7.0-4) testing; urgency=low
+
+  * Set $JAVA_HOME in startGroovy. (Closes: #580160)
+
+ -- Torsten Werner <twerner at debian.org>  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)

Modified: branches/groovy/testing/debian/patches/start-scripts.patch
===================================================================
--- branches/groovy/testing/debian/patches/start-scripts.patch	2010-09-02 21:04:22 UTC (rev 12955)
+++ branches/groovy/testing/debian/patches/start-scripts.patch	2010-09-02 21:25:55 UTC (rev 12956)
@@ -1,9 +1,18 @@
 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 @@
+--- 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.