[pkg-java] r12306 - in trunk/java-wrappers: . debian

[Vincent Fourmond]

Author: fourmond
Date: 2010-05-04 21:28:16 +0000 (Tue, 04 May 2010)
New Revision: 12306

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
[java-wrappers] Adding default as a valid JRE choice and actually make it the default for all; thank to twerner !

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2010-05-04 21:09:54 UTC (rev 12305)
+++ trunk/java-wrappers/debian/changelog	2010-05-04 21:28:16 UTC (rev 12306)
@@ -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

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2010-05-04 21:09:54 UTC (rev 12305)
+++ trunk/java-wrappers/jvm-list.sh	2010-05-04 21:28:16 UTC (rev 12306)
@@ -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 @@
 
 
 # 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.