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

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-03-30 04:04:58 +0000 (Wed, 30 Mar 2011)
New Revision: 13478

Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/patches/0001-start-scripts.patch
Log:
* Use the location of java command instead of javac one to determine
  JAVA_HOME. (Closes: #619844).
* Replace optional dependency of java5-runtime-headless with
  sun-java6-jre since is not true that groovy will work with any Java 5
  runtime available in Debian.


Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2011-03-30 03:59:14 UTC (rev 13477)
+++ trunk/groovy/debian/changelog	2011-03-30 04:04:58 UTC (rev 13478)
@@ -1,6 +1,11 @@
 groovy (1.7.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Use the location of java command instead of javac one to determine
+    JAVA_HOME. (Closes: #619844).
+  * Replace optional dependency of java5-runtime-headless with
+    sun-java6-jre since is not true that groovy will work with any Java 5
+    runtime available in Debian.
 
  -- Miguel Landaeta <miguel at miguel.cc>  Wed, 23 Mar 2011 19:50:48 -0430
 

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2011-03-30 03:59:14 UTC (rev 13477)
+++ trunk/groovy/debian/control	2011-03-30 04:04:58 UTC (rev 13478)
@@ -20,8 +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-jre-headless | java5-runtime-headless
+ libxstream-java, ivy, libjansi-java, default-jre-headless | sun-java6-jre
 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	2011-03-30 03:59:14 UTC (rev 13477)
+++ trunk/groovy/debian/patches/0001-start-scripts.patch	2011-03-30 04:04:58 UTC (rev 13478)
@@ -1,20 +1,22 @@
 From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Sun, 08 Aug 2010 19:54:15 -0430
+Date: Tue, 29 Mar 2011 19:50:41 -0430
 Subject: [PATCH] start-scripts
 
---- 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
+--- groovy-1.7.10.orig/src/bin/startGroovy
++++ groovy-1.7.10/src/bin/startGroovy
+@@ -71,8 +71,8 @@ if [ -z "$JAVA_HOME" ] ; then
+         [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
+         [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+     else
+-        javaExecutable="`which javac`"
+-        [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
++        javaExecutable="`which java`"
++        [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find java to deduce location, please set JAVA_HOME."
+         # readlink(1) is not available as standard on Solaris 10.
+         readLink=`which readlink`
+         [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
+@@ -105,27 +105,12 @@ 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.