[java-wrappers] 25/61: [java-wrappers] Adding default as a valid JRE choice and actually make it the default for all; thank to twerner !

[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 859aaaabce2b36f785d6ee654d984e242ce0f293
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue May 4 21:28:16 2010 +0000

    [java-wrappers] Adding default as a valid JRE choice and actually make it the default for all; thank to twerner !
---
 debian/changelog | 9 +++++++++
 jvm-list.sh      | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7e1893..d04bbda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+java-wrappers (0.1.16) unstable; urgency=low
+
+  * Adding default as a valid jre choice, and make it the default for
+    'all'; patch courtesy of Torsten Werner <twerner at debian.org>
+    (closes: #580180)
+
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 04 May 2010 23:25:27 +0200
+
 java-wrappers (0.1.15) unstable; urgency=low
 
   * Switch to Section java
diff --git a/jvm-list.sh b/jvm-list.sh
index f2c9edf..b008499 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -22,6 +22,9 @@
 # They can also be used for the JAVA_FLAVOR environment variable, see
 # java-wrappers(7).
 
+# default runtime
+__jvm_default="/usr/lib/jvm/default-java"
+
 # Sun runtimes
 __jvm_sun4="/usr/lib/j2*1.4-sun"
 __jvm_sun5="/usr/lib/jvm/java-1.5.0-sun /usr/lib/j2*1.5-sun"
@@ -61,6 +64,6 @@ __jvm_java2="$__jvm_java5 $__jvm_gcj2"
 
 
 # All JVMs
-__jvm_all="/usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
+__jvm_all="$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
 
-# Probably here should come a few meaningful global aliases.
\ No newline at end of file
+# Probably here should come a few meaningful global aliases.

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