[latexdraw] 113/147: Use java-wrappers to find the JRE, closes: #644615

[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 d6d6790e0ad2cdc1f6852616f4cdd4b30c1faa5b
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Oct 16 14:48:16 2011 +0000

    Use java-wrappers to find the JRE, closes: #644615
---
 debian/changelog                            |  2 ++
 debian/control                              |  5 +++--
 debian/patches/latexdraw_shell_script.patch | 25 +++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5ee148..fdbbfba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 latexdraw (2.0.8+1-2) UNRELEASED; urgency=low
 
+  * Fix "/usr/bin/latexdraw: 22: exec: /jre/bin/java: not found"
+    by using java-wrappers to find appropriate JREs (Closes: #644615).
   * Switch to dpkg-source 3.0 (quilt) format.
   * Simplify debian/rules with debhelper 7.
   * Update copyright to DEP-5 candidate format. 
diff --git a/debian/control b/debian/control
index a325c8b..ad6941c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Stuart Prescott <stuart+debian at nanonanonano.net>
 Build-Depends: debhelper (>= 7.3.5~)
-Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk,
+Build-Depends-Indep: openjdk-7-jre | openjdk-6-jdk | sun-java6-jdk,
                      ant,
                      imagemagick,
                      libjiu-java,
@@ -14,9 +14,10 @@ DM-Upload-Allowed: yes
 
 Package: latexdraw
 Architecture: all
-Depends: openjdk-6-jre | sun-java6-jre,
+Depends: openjdk-7-jre | openjdk-6-jre | sun-java6-jre,
          libjiu-java,
          libjlibeps-java,
+         java-wrappers,
          ${misc:Depends}
 Recommends: texlive-pstricks,
             texlive-base-bin,
diff --git a/debian/patches/latexdraw_shell_script.patch b/debian/patches/latexdraw_shell_script.patch
index dbb1d8b..53526a2 100644
--- a/debian/patches/latexdraw_shell_script.patch
+++ b/debian/patches/latexdraw_shell_script.patch
@@ -1,27 +1,24 @@
 Create a script for /usr/bin/latexdraw with a sensible JRE (regardless of how the alternatives have been set).
 --- /dev/null
 +++ b/latexdraw
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
 +#!/bin/sh
 +
 +# latexdraw wrapper script
 +
++# Include the wrappers utility script
++. /usr/lib/java-wrappers/java-wrappers.sh
++
 +# 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.
-+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-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
++# We need openjdk6, openjdk7 or sun6 runtime.
++find_java_runtime sun6 openjdk
 +
-+export JAVA=${JAVA:=java}
++find_jars LaTeXDraw net.sourceforge.jiu net.sourceforge.jlibeps
 +
-+exec $JAVA -jar /usr/share/java/LaTeXDraw.jar "$@"
++# Add /usr/share/doc/latexdraw/ to the classpath as it is used to
++# locate help files
++JAVA_CLASSPATH=$JAVA_CLASSPATH:/usr/share/doc/latexdraw/
 +
++run_java latexDraw.ui.LaTeXDraw "$@"

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