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

[Tony Mancill]

Author: tmancill
Date: 2014-04-08 04:47:39 +0000 (Tue, 08 Apr 2014)
New Revision: 18005

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
update java-wrappers to detect JDK 8/java8


Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2014-04-07 21:48:19 UTC (rev 18004)
+++ trunk/java-wrappers/debian/changelog	2014-04-08 04:47:39 UTC (rev 18005)
@@ -1,8 +1,8 @@
 java-wrappers (0.1.28) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Add support for detecting Oracle JRE/JDK 7 (when installed from a
-    java-package .deb).  (Closes: #743248)
+  * Add support for detecting Oracle JRE/JDK 7 and 8 (when installed
+    from a java-package .deb). (Closes: #743248)
 
  -- tony mancill <tmancill at debian.org>  Sun, 06 Apr 2014 22:03:40 -0700
 

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2014-04-07 21:48:19 UTC (rev 18004)
+++ trunk/java-wrappers/jvm-list.sh	2014-04-08 04:47:39 UTC (rev 18005)
@@ -32,6 +32,7 @@
 
 # Oracle runtimes
 __jvm_oracle7="/usr/lib/jvm/jdk-7-oracle-* /usr/lib/jvm/jre-7-oracle-*"
+__jvm_oracle8="/usr/lib/jvm/jdk-8-oracle-* /usr/lib/jvm/jre-8-oracle-*"
 
 # all sun runtimes
 __jvm_sun="$__jvm_sun6"
@@ -43,6 +44,7 @@
 __jvm_gcj5="/usr/lib/jvm/java-1.5*-gcj-4.* "
 __jvm_openjdk6="/usr/lib/jvm/java-6-openjdk-$__arch /usr/lib/jvm/java-6-openjdk"
 __jvm_openjdk7="/usr/lib/jvm/java-7-openjdk-$__arch /usr/lib/jvm/java-7-openjdk"
+__jvm_openjdk8="/usr/lib/jvm/java-8-openjdk-$__arch /usr/lib/jvm/java-8-openjdk"
 
 
 # And a few aliases
@@ -50,7 +52,8 @@
 __jvm_openjdk="$__jvm_openjdk7 $__jvm_openjdk6"
 
 # The java* runtimes:
-__jvm_java7="$__jvm_openjdk7 $__jvm_oracle7"
+__jvm_java8="$__jvm_openjdk8 $__jvm_oracle8"
+__jvm_java7="$__jvm_java8 $__jvm_openjdk7 $__jvm_oracle7"
 # -> corresponds to Provides: java6-runtime 
 __jvm_java6="$__jvm_java7 $__jvm_openjdk6 $__jvm_sun6"
 # -> corresponds to Provides: java5-runtime