[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-25-gd82a17a

[David Paleino]

The following commit has been merged in the master branch:
commit d82a17ae039cc7c8d453b650d58dca8714445d2b
Author: David Paleino <dapal at debian.org>
Date:   Wed Aug 31 21:28:55 2011 +0200

    Support multi-archified OpenJDK (Closes: #639853)

diff --git a/debian/changelog b/debian/changelog
index a69c03b..7b8e19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 josm (0.0.svn4279+dfsg1-1) UNRELEASED; urgency=low
 
+  [ Giovanni Mascellani ]
   * New upstream release (closes: #636345).
   * debian/patches:
     - refreshed and modified according new upstream version
@@ -12,7 +13,10 @@ josm (0.0.svn4279+dfsg1-1) UNRELEASED; urgency=low
     - generate some deleted autogenerated code.
   * debian/README.source: added, with details about repackaging.
 
- -- Giovanni Mascellani <gio at debian.org>  Sat, 27 Aug 2011 18:52:48 +0200
+  [ David Paleino ]
+  * Support multi-archified OpenJDK (Closes: #639853)
+
+ -- David Paleino <dapal at debian.org>  Wed, 31 Aug 2011 21:28:30 +0200
 
 josm (0.0.svn4064-3) unstable; urgency=low
 
diff --git a/debian/josm.sh b/debian/josm.sh
index 9bfe5f6..14c9117 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -6,9 +6,12 @@ set -e
 # Override to a specific one using $JAVACMD
 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
 
+# Let's get the current architecture -- needed for multiarchified Java
+ARCH="`dpkg --print-architecture`"
+
 # 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"
+	JAVA_CMDS="$JAVA_HOME/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

-- 
Editor for OpenStreetMap