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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-08-27 20:40:11 +0000 (Wed, 27 Aug 2008)
New Revision: 6947

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/java-wrappers.7
   trunk/java-wrappers/java-wrappers.sh
   trunk/java-wrappers/jvm-list.sh
Log:
[java-wrappers] Ready for the upload to experimental

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2008-08-26 21:00:31 UTC (rev 6946)
+++ trunk/java-wrappers/debian/changelog	2008-08-27 20:40:11 UTC (rev 6947)
@@ -1,7 +1,7 @@
-java-wrappers (0.1.7) UNRELEASED; urgency=low
+java-wrappers (0.1.7) experimental; urgency=low
 
-  * NOT RELEASED YET
   * Rewrite of find_java_runtime in a much more flexible fashion... 
+    (closes: #494744)
 
  -- Vincent Fourmond <fourmond at debian.org>  Tue, 22 Jul 2008 23:49:08 +0200
 

Modified: trunk/java-wrappers/java-wrappers.7
===================================================================
--- trunk/java-wrappers/java-wrappers.7	2008-08-26 21:00:31 UTC (rev 6946)
+++ trunk/java-wrappers/java-wrappers.7	2008-08-27 20:40:11 UTC (rev 6947)
@@ -73,10 +73,8 @@
 A probably more easy-to-use version of the 
 .I JAVA_HOME
 variable: instead of specifying the full path of the java runtime, you
-name it. Relevant code names can be found in the comments of the function
-.I find_java_runtime
-in the file
-.IR /usr/lib/java-wrappers/java-wrappers.sh .
+name it. List of available flavors can be found in the file
+.IR /usr/lib/java-wrappers/jvm-list.sh .
 See examples below.
 
 

Modified: trunk/java-wrappers/java-wrappers.sh
===================================================================
--- trunk/java-wrappers/java-wrappers.sh	2008-08-26 21:00:31 UTC (rev 6946)
+++ trunk/java-wrappers/java-wrappers.sh	2008-08-27 20:40:11 UTC (rev 6947)
@@ -41,16 +41,8 @@
 # If JAVA_CMD exists, nothing is done. If JAVA_HOME exists, only that
 # is searched.
 #
-# In the other cases, the runtime is looked for according to the
-# following arguments:
-#  * 2 : java runtime 2 
-#  * swing : a JVM that has swing
-#  * fullxml: a JVM that has all XML classes, including
-#    javax.xml.stream.util.StreamReaderDelegate
-#  * sun: sun's JVM, for stuff depending on the infamous com.sun classes
-#  * sun6: sun's JVM version 6
-#  * icedtea: icedtea
-#  * openjdk: openjdk6
+# The full list of JVM names understood can be found in the file
+# /usr/lib/java-wrappers/jvm-list.sh.
 #
 # More than one argument can be specified; they will be taken into account
 # in that order; the first one found will be selected.
@@ -128,7 +120,7 @@
 	java_debug "Found JAVA_CMD = '$JAVA_CMD'"
 	return 0		# Fine
     else
-	java_warning "No java runtime was found for flavor '${1:-none}'"
+	java_warning "No java runtime was found"
 	return 1;
     fi
 }

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2008-08-26 21:00:31 UTC (rev 6946)
+++ trunk/java-wrappers/jvm-list.sh	2008-08-27 20:40:11 UTC (rev 6947)
@@ -18,6 +18,9 @@
 # All variables defined here can be used as arguments for the
 # find_java_runtime function if you strip the __jvm_ at the beginning
 # of the variable...
+#
+# They can also be used for the JAVA_FLAVOR environment variable, see
+# java-wrappers(7).
 
 # Sun runtimes
 __jvm_sun4="/usr/lib/j2*1.4-sun"