# HG changeset patch
# User doko@ubuntu.com
# Date 1236455008 -3600
# Node ID a912ddc51c0f93afe7b399f6790afbef29a66391
# Parent  fb6a59ff80050a57cae52c6ef853f8b0ea6bb3ed
2009-03-07  Matthias Klose  <doko@ubuntu.com>

        * patches/icedtea-version.patch: Identify as IcedTea when Cacao is used
        as JVM.

diff -r fb6a59ff8005 -r a912ddc51c0f ChangeLog
--- a/ChangeLog	Sat Mar 07 20:41:34 2009 +0100
+++ b/ChangeLog	Sat Mar 07 20:43:28 2009 +0100
@@ -1,6 +1,8 @@
 2009-03-07  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (icedtea.stamp, icedtea-debug.stamp): Create target dirs.
+	* patches/icedtea-version.patch: Identify as IcedTea when Cacao is used
+	as JVM.
 
 2009-03-06  Gary Benson  <gbenson@redhat.com>
 
diff -r fb6a59ff8005 -r a912ddc51c0f patches/icedtea-version.patch
--- a/patches/icedtea-version.patch	Sat Mar 07 20:41:34 2009 +0100
+++ b/patches/icedtea-version.patch	Sat Mar 07 20:43:28 2009 +0100
@@ -38,14 +38,21 @@
      static {
          init();
      }
-@@ -82,8 +88,17 @@
+@@ -81,12 +87,26 @@
+         /* First line: platform version. */
          ps.println(launcher_name + " version \"" + java_version + "\"");
  
++        String java_vm_name    = System.getProperty("java.vm.name");
++
          /* Second line: runtime version (ie, libraries). */
 -        ps.println(java_runtime_name + " (build " +
 -                           java_runtime_version + ")");
 +	StringBuilder sb = new StringBuilder();
-+	sb.append(java_runtime_name);
++	if (java_vm_name.toLowerCase().startsWith("cacao")) {
++	    sb.append("IcedTea Runtime Environment");
++	} else {
++	    sb.append(java_runtime_name);
++	}
 +	if (jdk_derivative_name.length() > 0) {
 +	    sb.append(" (").append(jdk_derivative_name).append(")");
 +	}
@@ -57,7 +64,10 @@
 +	ps.println(sb.toString());
  
          /* Third line: JVM information. */
-         String java_vm_name    = System.getProperty("java.vm.name");
+-        String java_vm_name    = System.getProperty("java.vm.name");
+         String java_vm_version = System.getProperty("java.vm.version");
+         String java_vm_info    = System.getProperty("java.vm.info");
+         ps.println(java_vm_name + " (build " + java_vm_version + ", " +
 --- openjdk/jdk/make/java/version/Makefile.~1~	2008-11-25 01:01:15.000000000 -0800
 +++ openjdk/jdk/make/java/version/Makefile	2009-02-20 09:03:56.000000000 -0800
 @@ -39,6 +39,8 @@