[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3592-1-7-g6cd1498

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit d32ad2ac5806dfa5706a9c1102129d1b2edfcd68
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 27 15:21:40 2010 +0100

     * josm.sh: detect and don't use only headless OpenJDK 6;
     * josm.sh: SUN Java 5 isn't supported anymore.

diff --git a/debian/changelog b/debian/changelog
index b71df4b..e4e7796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 josm (0.0.svn3592-2) UNRELEASED; urgency=low
 
+  [ David Paleino ]
   * debian/rules:
     - don't install XPM versions of the icons anymore
   * debian/icons/*.xpm updated from the logo.png image
@@ -9,7 +10,12 @@ josm (0.0.svn3592-2) UNRELEASED; urgency=low
   * debian/josm.{desktop,menu}: move from Geoscience to Geography
     (LP: #643205)
 
- -- David Paleino <dapal at debian.org>  Thu, 25 Nov 2010 09:38:12 +0100
+  [ Giovanni Mascellani ]
+  * josm.sh:
+    - remove SUN Java 5, which isn't supperted any more
+    - don't try to use OpenJDK 6 virtual machine if it's only headless
+
+ -- Giovanni Mascellani <gio at debian.org>  Sat, 27 Nov 2010 15:20:35 +0100
 
 josm (0.0.svn3592-1) unstable; urgency=low
 
diff --git a/debian/josm.sh b/debian/josm.sh
index 62ab577..8bc1c45 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -5,7 +5,14 @@ set -e
 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Sun's proprietary JDK.
 # Override to a specific one using $JAVACMD
 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
-JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/bin/java"
+
+# If OpenJDK 6 is only available headless, do not try it
+if dpkg --get-selections openjdk-6-jre | grep install$ > /dev/null ; then
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/bin/java"
+else
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java"
+fi
+
 JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 
 for jcmd in $JAVA_CMDS; do

-- 
Java OpenStreetMap editor