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

[Gabriele Giacone]

Author: gg0-guest
Date: 2011-01-12 21:21:07 +0000 (Wed, 12 Jan 2011)
New Revision: 13199

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
add java-alternatives jvm to find_java_runtime() when no args

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2011-01-10 01:05:08 UTC (rev 13198)
+++ trunk/java-wrappers/debian/changelog	2011-01-12 21:21:07 UTC (rev 13199)
@@ -1,3 +1,9 @@
+java-wrappers (0.1.17) UNRELEASED; urgency=low
+
+  * REMOVEME toward java-alternatives integration (will close #609731).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 12 Jan 2011 22:18:19 +0100
+
 java-wrappers (0.1.16) unstable; urgency=low
 
   * Adding default as a valid jre choice, and make it the default for

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2011-01-10 01:05:08 UTC (rev 13198)
+++ trunk/java-wrappers/jvm-list.sh	2011-01-12 21:21:07 UTC (rev 13199)
@@ -62,8 +62,10 @@
 # -> corresponds to Provides: java2-runtime 
 __jvm_java2="$__jvm_java5 $__jvm_gcj2"
 
+# current java alternatives
+__jvm_alt=$(readlink /etc/alternatives/java|sed -n 's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p')
 
 # All JVMs
-__jvm_all="$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
+__jvm_all="$__jvm_alt $__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
 
 # Probably here should come a few meaningful global aliases.