[SCM] osmosis branch, master, updated. debian/0.31.2-2-58-g3adf508

[David Paleino]

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

    Fix debian/rules to support multi-archified java

diff --git a/debian/changelog b/debian/changelog
index e879861..4b2b95e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
   * Fix get-orig-source target in debian/rules
   * Use debhelper compatibility 8
   * Bump Standards-Version to 3.9.1, no changes needed
+  * Fix debian/rules to support multi-archified java
 
   [ Giovanni Mascellani ]
   * debian/watch: updated
@@ -15,7 +16,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
   * Depend on headless runtime environment and use default-jdk at
     building time (closes: #613135).
 
- -- Giovanni Mascellani <gio at debian.org>  Sun, 13 Feb 2011 10:20:06 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 28 Sep 2011 10:30:56 +0200
 
 osmosis (0.34+ds1-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 1ccb784..58dcb17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk-$(shell dpkg --print-architecture)/
 
 DEB_JARS := /usr/share/java/mysql-connector-java.jar
 DEB_JARS += /usr/share/java/postgis.jar

-- 
Osmosis, an OSM data processor