Author: nomadium-guest Date: 2010-08-09 00:38:14 +0000 (Mon, 09 Aug 2010) New Revision: 12894
Modified: trunk/groovy/debian/changelog trunk/groovy/debian/control trunk/groovy/debian/patches/0001-start-scripts.patch Log: Revert Depends on default-jdk. Set correct JAVA_HOME in startGroovy script Modified: trunk/groovy/debian/changelog =================================================================== --- trunk/groovy/debian/changelog 2010-08-08 18:49:02 UTC (rev 12893) +++ trunk/groovy/debian/changelog 2010-08-09 00:38:14 UTC (rev 12894) @@ -1,3 +1,9 @@ +groovy (1.7.4-2) UNRELEASED; urgency=low + + * Revert Depends on default-jdk. Set correct JAVA_HOME in startGroovy script. + + -- Miguel Landaeta <[email protected]> Sun, 08 Aug 2010 19:56:30 -0430 + groovy (1.7.4-1) unstable; urgency=low * New upstream release. Modified: trunk/groovy/debian/control =================================================================== --- trunk/groovy/debian/control 2010-08-08 18:49:02 UTC (rev 12893) +++ trunk/groovy/debian/control 2010-08-09 00:38:14 UTC (rev 12894) @@ -20,7 +20,7 @@ libcommons-cli-java (>= 1.0), libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>= 1.2), libservlet2.5-java, libjline-java, - libxstream-java, ivy, libjansi-java, default-jdk + libxstream-java, ivy, libjansi-java, default-jre-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/patches/0001-start-scripts.patch =================================================================== --- trunk/groovy/debian/patches/0001-start-scripts.patch 2010-08-08 18:49:02 UTC (rev 12893) +++ trunk/groovy/debian/patches/0001-start-scripts.patch 2010-08-09 00:38:14 UTC (rev 12894) @@ -1,18 +1,20 @@ From: Debian Java Maintainers <[email protected]> -Date: Sun, 11 Apr 2010 22:05:01 +0200 +Date: Sun, 08 Aug 2010 19:54:15 -0430 Subject: [PATCH] start-scripts -=================================================================== ---- - src/bin/startGroovy | 19 ++----------------- - 1 files changed, 2 insertions(+), 17 deletions(-) - -diff --git a/src/bin/startGroovy b/src/bin/startGroovy -index 7bf8803..76d1457 100644 ---- a/src/bin/startGroovy -+++ b/src/bin/startGroovy -@@ -105,27 +105,12 @@ fi +--- groovy-1.7.4.orig/src/bin/startGroovy ++++ groovy-1.7.4/src/bin/startGroovy +@@ -65,6 +65,8 @@ if [ "$1" = "-cp" -o "$1" = "-classpath" + 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. @@ -41,4 +43,3 @@ fi STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@" --- _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
