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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2009-02-08 15:40:35 +0000 (Sun, 08 Feb 2009)
New Revision: 7949

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
[java-wrappers] Fix for bug #514339

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2009-02-07 18:49:57 UTC (rev 7948)
+++ trunk/java-wrappers/debian/changelog	2009-02-08 15:40:35 UTC (rev 7949)
@@ -1,3 +1,11 @@
+java-wrappers (0.1.12) yet UNRELEASED experimental; urgency=low
+
+  * Now provides java2, java5 and java6 aliases that correspond respectively
+    to the java2-runtime, java5-runtime and java6-runtime virtual packages
+    (closes: #514339)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 08 Feb 2009 16:38:13 +0100
+
 java-wrappers (0.1.11) experimental; urgency=low
 
   * Adding (back) the sunmin5 alias for jabref

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2009-02-07 18:49:57 UTC (rev 7948)
+++ trunk/java-wrappers/jvm-list.sh	2009-02-08 15:40:35 UTC (rev 7949)
@@ -1,5 +1,5 @@
 # jvm-list.sh: a list of available JVM and some shortcuts
-# Copyright 2008 by Vincent Fourmond <fourmond at debian.org>
+# Copyright 2008, 2009 by Vincent Fourmond <fourmond at debian.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -33,14 +33,16 @@
 __jvm_sunmin5="$__jvm_sun5 $__jvm_sun6"
 
 # IBM runtimes. This comes from argouml.sh
+# I'm not quite sure it is still useful, but, we never know !
 __jvm_ibm="/usr/lib/j2*1.[456]-ibm"
 
 
 # Now, free runtimes:
 __jvm_gcj2="/usr/lib/jvm/java-*-gcj-4.* "
-__jvm_sablevm="/usr/lib/sablevm"
+__jvm_gcj5="/usr/lib/jvm/java-1.5*-gcj-4.* "
+__jvm_sablevm="/usr/lib/sablevm" # Probably should be dropped, only in etch
 __jvm_kaffe="/usr/lib/kaffe /usr/lib/kaffe/pthreads /usr/lib/kaffe/jthreads"
-__jvm_icedtea="/usr/lib/jvm/java-7-icedtea"
+__jvm_icedtea="/usr/lib/jvm/java-7-icedtea" # Probably should be dropped... 
 __jvm_cacao="/usr/lib/jvm/cacao"
 __jvm_openjdk6="/usr/lib/jvm/java-6-openjdk"
 __jvm_cacaooj6="/usr/lib/jvm/java-6-cacao/jre"
@@ -49,6 +51,15 @@
 __jvm_gcj="$__jvm_gcj2"
 __jvm_openjdk="$__jvm_openjdk6 $__jvm_cacaooj6"
 
+# The java* runtimes:
+# -> corresponds to Provides: java6-runtime 
+__jvm_java6="$__jvm_openjdk6 $__jvm_cacaooj6 $__jvm_sun6"
+# -> corresponds to Provides: java5-runtime 
+__jvm_java5="$__jvm_gcj5 $__jvm_java6 $__jvm_sun5"
+# -> corresponds to Provides: java2-runtime 
+__jvm_java2="$__jvm_java5 $__jvm_gcj2"
+
+
 # All JVMs
 __jvm_all="/usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"