[java-wrappers] 42/61: [java-wrappers] Really fix the architecture dependence of openjdk-6 + take openjdk7 into account as well

[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 1ae05353411c177ab1a015b14976b6df02ea57d9
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Sep 14 16:31:55 2011 +0000

    [java-wrappers] Really fix the architecture dependence of openjdk-6 + take openjdk7 into account as well
---
 debian/changelog | 8 ++++++++
 jvm-list.sh      | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01526b5..f520d10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+java-wrappers (0.1.24) unstable; urgency=low
+
+  * Drop the use of dpkg-architecture in favor of dpkg (closes: #641499)
+  * Take into account openjdk-7, patch courtesy of Adrian Bunk
+    <bunk at stusta.de> (closes: #641420)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 14 Sep 2011 18:28:00 +0200
+
 java-wrappers (0.1.23) unstable; urgency=medium
 
   * Correctly find the now architecture-dependent openjdk6 flavor (closes:
diff --git a/jvm-list.sh b/jvm-list.sh
index c79cc90..ddb5daf 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -22,7 +22,7 @@
 # They can also be used for the JAVA_FLAVOR environment variable, see
 # java-wrappers(7).
 
-__arch=$(dpkg-architecture -qDEB_HOST_ARCH)
+__arch=$(dpkg --print-architecture)
 
 # default runtime
 __jvm_default="/usr/lib/jvm/default-java"
@@ -39,15 +39,17 @@ __jvm_sunmin5="$__jvm_sun6"
 __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-$__arch /usr/lib/jvm/java-6-openjdk"
+__jvm_openjdk7="/usr/lib/jvm/java-7-openjdk-$__arch /usr/lib/jvm/java-7-openjdk"
 
 
 # And a few aliases
 __jvm_gcj="$__jvm_gcj2"
-__jvm_openjdk="$__jvm_openjdk6"
+__jvm_openjdk="$__jvm_openjdk7 $__jvm_openjdk6"
 
 # The java* runtimes:
+__jvm_java7="$__jvm_openjdk7"
 # -> corresponds to Provides: java6-runtime 
-__jvm_java6="$__jvm_openjdk6 $__jvm_sun6"
+__jvm_java6="$__jvm_openjdk6 $__jvm_sun6 $__jvm_java7"
 # -> corresponds to Provides: java5-runtime 
 __jvm_java5="$__jvm_gcj5 $__jvm_java6"
 # -> corresponds to Provides: java2-runtime 

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