[Pkg-osm-commits] [SCM] mkgmapgui branch, master, updated. debian/1.1.ds-1-6-g37b2305

[David Paleino]

The following commit has been merged in the master branch:
commit 85f431aef006c06f8c420c82a0123ef49383d3b4
Author: David Paleino <dapal at debian.org>
Date:   Sat Apr 14 18:49:13 2012 +0200

    Fix wrapper script to look for generic OpenJDK (Closes: #668283)

diff --git a/debian/changelog b/debian/changelog
index 73a1501..0e453df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mkgmapgui (1.1.ds-2) UNRELEASED; urgency=low
+
+  * Fix wrapper script to look for generic OpenJDK (Closes: #668283)
+
+ -- David Paleino <dapal at debian.org>  Sat, 14 Apr 2012 18:48:44 +0200
+
 mkgmapgui (1.1.ds-1) unstable; urgency=low
 
   * Initial release. (Closes: #626841)
diff --git a/debian/mkgmapgui.sh b/debian/mkgmapgui.sh
index f1f07f4..b592020 100755
--- a/debian/mkgmapgui.sh
+++ b/debian/mkgmapgui.sh
@@ -6,9 +6,12 @@ set -e
 # Override to a specific one using $JAVACMD
 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/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"
+# Let's get the current architecture -- needed for multiarchified Java
+ARCH="`dpkg --print-architecture`"
+
+# If OpenJDK is only available headless, do not try it
+if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
+   JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/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

-- 
Gui for mkgmap