[latexdraw] 39/147: * also test for openjdk-6 in JRE tests

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository latexdraw.

commit f304cb72cda6a4473cac8508f781a0e820a1d845
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Jul 23 23:46:22 2008 +0000

    * also test for openjdk-6 in JRE tests
---
 latexdraw | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/latexdraw b/latexdraw
index f96230a..27bc930 100644
--- a/latexdraw
+++ b/latexdraw
@@ -1,12 +1,16 @@
 #!/bin/sh
 
 # latexdraw wrapper script
-# code for java detection borrowed from tuxguitar
 
+# Find an appropriate java runtime environment as we can't rely on
+# the alternatives setting in /usr/bin/java to provide the appropriate
+# version of java even if the package is installed.
+# (detection code adapted from tuxguitar)
 if [ -z $JAVA_HOME ]
 then
-  t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
-  t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
+  #t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
+  t=/usr/lib/jvm/java-6-sun     && test -d $t && JAVA_HOME=$t
+  t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
   JAVA=${JAVA_HOME}/jre/bin/java
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/latexdraw.git