r35281 - in /packages/worldwind/trunk/debian: bin/worldwind changelog control

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Sun Oct 26 23:10:59 2008
New Revision: 35281

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35281
Log:
 Use the script java-wrappers to launch the application.

Modified:
    packages/worldwind/trunk/debian/bin/worldwind
    packages/worldwind/trunk/debian/changelog
    packages/worldwind/trunk/debian/control

Modified: packages/worldwind/trunk/debian/bin/worldwind
URL: http://svn.debian.org/wsvn/debian-science/packages/worldwind/trunk/debian/bin/worldwind?rev=35281&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/bin/worldwind (original)
+++ packages/worldwind/trunk/debian/bin/worldwind Sun Oct 26 23:10:59 2008
@@ -1,4 +1,12 @@
 #!/bin/sh
+# Shell script wrapper around the worldwind program,
+# Copyright 2008 by Sylvestre Ledru <sylvestre.ledru at inria.fr>
+#
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+
 # Startup script of Worldwind for Debian
 
 if test "$1" == "-h" -o "$1" == "--help"; then
@@ -54,22 +62,14 @@
 
 APPLICATION=$1
 
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun"
-for jdir in $JDK_DIRS; do
-        if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-			JAVA_HOME="$jdir"
-		fi
-done
-
-if [ -z "${JAVA_HOME}" ]; then
-	echo "Could not find any Sun JRE (Java Runtime Environment). Please install packages (openjdk-6-jre, sun-java5-jre or sun-java6-jre)."
-	echo "You should not have this message if you install worldwind Debian Packages with its dependencies."
-fi
-
-
-
 if [ -z "${APPLICATION}" ]; then
 	APPLICATION="ApplicationTemplate"
 fi
 
-$JAVA_HOME/bin/java -Dsun.java2d.noddraw=true -Djava.library.path=/usr/lib/jni/ -classpath /usr/share/java/jogl.jar:/usr/share/java/gluegen-rt.jar:/usr/share/java/worldwind.jar:/usr/share/java/worldwind-demo.jar gov.nasa.worldwind.examples.$APPLICATION
+# We prefer to use openjdk or Sun's java if available
+find_java_runtime openjdk sun  || find_java_runtime 
+
+find_jars jogl gluegen-rt worldwind worldwind-demo
+JAVA_ARGS="-Dsun.java2d.noddraw=true -Djava.library.path=/usr/lib/jni/"
+
+run_java gov.nasa.worldwind.examples.$APPLICATION

Modified: packages/worldwind/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/worldwind/trunk/debian/changelog?rev=35281&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/changelog (original)
+++ packages/worldwind/trunk/debian/changelog Sun Oct 26 23:10:59 2008
@@ -1,3 +1,9 @@
+worldwind (0.5.0-6) unstable; urgency=low
+
+  * Use the script java-wrappers to launch the application.
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Mon, 27 Oct 2008 00:01:37 +0100
+
 worldwind (0.5.0-5) unstable; urgency=low
 
   * Debian-science added as maintainer

Modified: packages/worldwind/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/worldwind/trunk/debian/control?rev=35281&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/control (original)
+++ packages/worldwind/trunk/debian/control Sun Oct 26 23:10:59 2008
@@ -14,7 +14,7 @@
 
 Package: worldwind
 Architecture: all
-Depends: libworldwind-java
+Depends: libworldwind-java, java-wrappers
 Description: 3D Virtual Globe 
  World Wind allows any user to zoom from satellite altitude into
  any place on Earth, leveraging high resolution LandSat imagery