[java-wrappers] 15/61: [java-wrappers] Ready for the upload to experimental

[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 dfc5ef72ca2743be458717495c7fb9bf494a0fa9
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Aug 27 20:40:11 2008 +0000

    [java-wrappers] Ready for the upload to experimental
---
 debian/changelog |  4 ++--
 java-wrappers.7  |  6 ++----
 java-wrappers.sh | 14 +++-----------
 jvm-list.sh      |  3 +++
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94d77e8..61d89d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/java-wrappers.7 b/java-wrappers.7
index 337cce5..5f0a65b 100644
--- a/java-wrappers.7
+++ b/java-wrappers.7
@@ -73,10 +73,8 @@ is used.
 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.
 
 
diff --git a/java-wrappers.sh b/java-wrappers.sh
index 1320a5a..b3c6266 100644
--- a/java-wrappers.sh
+++ b/java-wrappers.sh
@@ -41,16 +41,8 @@ java_fail() {
 # 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 @@ find_java_runtime() {
 	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
 }
diff --git a/jvm-list.sh b/jvm-list.sh
index d76c966..b7f8c64 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -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"

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