Bug#641420: java-wrappers: /usr/lib/java-wrappers/jvm-list.sh doesn't know about openjdk-7

[Adrian Bunk]

Package: java-wrappers
Version: 0.1.23
Severity: serious
Tags: patch

<--  snip  -->

$ azureus 
[warning] /usr/bin/azureus: No java runtime was found
[warning] /usr/bin/azureus: No JAVA_CMD set for run_java, falling back to JAVA_CMD = java
....

<--  snip  -->

openjdk-7-jre is the only JRE I have installed, but
/usr/lib/java-wrappers/jvm-list.sh doesn't know about it.

A fix is attached.

I omitted a comment "# -> corresponds to Provides: java7-runtime"
since that's not provided by openjdk-7-jre - is that a bug?
-------------- next part --------------
--- jvm-list.sh	2011-09-13 12:52:35.000000000 +0300
+++ /usr/lib/java-wrappers/jvm-list.sh	2011-09-13 12:55:22.000000000 +0300
@@ -39,15 +39,17 @@
 __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