[latexdraw] 100/147: * close 573901

[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 6f22bc66c00bb40ef630b1705f399643a77c434b
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Mar 14 23:34:33 2010 +0000

    * close 573901
---
 debian/changelog                                    |  1 +
 debian/patches/build_system.patch                   |  4 ++--
 debian/patches/disable_update_available_check.patch |  4 ++--
 debian/patches/latexdraw_shell_script.patch         | 12 ++++++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66842a3..f8388fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 latexdraw (2.0.7+1-1) unstable; urgency=low
 
   * New upstream release
+  * Change order of JRE detection in wrapper script (Closes: #573901)
 
  -- Stuart Prescott <stuart+debian at nanonanonano.net>  Wed, 10 Mar 2010 09:49:59 +0000
 
diff --git a/debian/patches/build_system.patch b/debian/patches/build_system.patch
index df3c300..ea9f11c 100644
--- a/debian/patches/build_system.patch
+++ b/debian/patches/build_system.patch
@@ -1,6 +1,6 @@
 Alter build system to make use of external libraries rather than bundling them into jar file.
---- trunk.orig/build.xml
-+++ trunk/build.xml
+--- a/build.xml
++++ b/build.xml
 @@ -27,6 +27,13 @@
  	</target>
  		
diff --git a/debian/patches/disable_update_available_check.patch b/debian/patches/disable_update_available_check.patch
index 67c60b6..42beb1c 100644
--- a/debian/patches/disable_update_available_check.patch
+++ b/debian/patches/disable_update_available_check.patch
@@ -1,6 +1,6 @@
 Disable LaTeXDraw's built-in update notifier that checks to see if a new version is available.
---- trunk.orig/latexDraw/ui/LaTeXDrawFrame.java
-+++ trunk/latexDraw/ui/LaTeXDrawFrame.java
+--- a/latexDraw/ui/LaTeXDrawFrame.java
++++ b/latexDraw/ui/LaTeXDrawFrame.java
 @@ -68,7 +68,7 @@
  	public final static String VERSION_STABILITY = ""; //$NON-NLS-1$
  	
diff --git a/debian/patches/latexdraw_shell_script.patch b/debian/patches/latexdraw_shell_script.patch
index 0539042..dbb1d8b 100644
--- a/debian/patches/latexdraw_shell_script.patch
+++ b/debian/patches/latexdraw_shell_script.patch
@@ -1,7 +1,7 @@
 Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how the alternatives have been set).
 --- /dev/null
-+++ trunk/latexdraw
-@@ -0,0 +1,19 @@
++++ b/latexdraw
+@@ -0,0 +1,23 @@
 +#!/bin/sh
 +
 +# latexdraw wrapper script
@@ -9,15 +9,19 @@ Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how th
 +# 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-6-openjdk && test -d $t && JAVA_HOME=$t
++  t=/usr/lib/jvm/java-6-sun     && test -d $t && JAVA_HOME=$t
++fi
++
++if [ -n $JAVA_HOME ]
++then
 +  JAVA=${JAVA_HOME}/jre/bin/java
 +fi
 +
 +export JAVA=${JAVA:=java}
 +
 +exec $JAVA -jar /usr/share/java/LaTeXDraw.jar "$@"
++

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