[mkgmap] 04/05: Update mkgmap wrapper for OpenJDK 7, remove Java 6 support.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mkgmap.

commit 015ab0f267cf77f839a0e4c6ec137b41ce94c64e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 3 13:39:11 2015 +0200

    Update mkgmap wrapper for OpenJDK 7, remove Java 6 support.
---
 debian/changelog      | 1 +
 debian/scripts/mkgmap | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2965c38..f72fab7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mkgmap (0.0.0+svn3498-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
+  * Update mkgmap wrapper for OpenJDK 7, remove Java 6 support.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 03 Apr 2015 13:21:07 +0200
 
diff --git a/debian/scripts/mkgmap b/debian/scripts/mkgmap
index 00f0870..d1c162e 100644
--- a/debian/scripts/mkgmap
+++ b/debian/scripts/mkgmap
@@ -2,11 +2,13 @@
 # Simple wrapper script to execute mkgmap in Debian
 set -e
 
+ARCH="`dpkg --print-architecture`"
+
 # First, the users preference as defined by $JAVA_HOME. Next, the
 # other JVMs known to work with mkgmap, with the one working best
 # fist, and the less functional onces after that. Last, use /usr/bin/java.
 # Override to a specific one using JAVACMD
-JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/jre/bin/java /usr/lib/jvm/java-1.5.0-sun/jre/bin/java /usr/bin/java"
+JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/bin/java"
 
 for jcmd in $JAVA_CMDS; do
     if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then

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