[java-wrappers] 41/61: [java-wrappers] (almost) fix the new arch-dependent dirs for openjdk

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-wrappers.

commit 0fe7d55fa97d52453cb03fadb104391497dd2885
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Sep 14 16:24:29 2011 +0000

    [java-wrappers] (almost) fix the new arch-dependent dirs for openjdk
---
 debian/changelog | 8 ++++++++
 jvm-list.sh      | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 135f72e..01526b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+java-wrappers (0.1.23) unstable; urgency=medium
+
+  * Correctly find the now architecture-dependent openjdk6 flavor (closes:
+    #640813)
+  * Urgency medium to avoid breaking applications in testing when openjdk6 migrates
+
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 09 Sep 2011 22:56:25 +0200
+
 java-wrappers (0.1.22) unstable; urgency=low
 
   * Now correctly following relative links from classpaths.
diff --git a/jvm-list.sh b/jvm-list.sh
index d96b257..c79cc90 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -22,6 +22,8 @@
 # They can also be used for the JAVA_FLAVOR environment variable, see
 # java-wrappers(7).
 
+__arch=$(dpkg-architecture -qDEB_HOST_ARCH)
+
 # default runtime
 __jvm_default="/usr/lib/jvm/default-java"
 
@@ -36,7 +38,8 @@ __jvm_sunmin5="$__jvm_sun6"
 # Now, free runtimes:
 __jvm_gcj2="/usr/lib/jvm/java-*-gcj-4.* "
 __jvm_gcj5="/usr/lib/jvm/java-1.5*-gcj-4.* "
-__jvm_openjdk6="/usr/lib/jvm/java-6-openjdk"
+__jvm_openjdk6="/usr/lib/jvm/java-6-openjdk-$__arch /usr/lib/jvm/java-6-openjdk"
+
 
 # And a few aliases
 __jvm_gcj="$__jvm_gcj2"

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