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

[Tony Mancill]

Author: tmancill
Date: 2014-04-07 05:18:37 +0000 (Mon, 07 Apr 2014)
New Revision: 17993

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
patch for #743248 - support Oracle Java 7 paths from java-package

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2014-04-06 22:28:59 UTC (rev 17992)
+++ trunk/java-wrappers/debian/changelog	2014-04-07 05:18:37 UTC (rev 17993)
@@ -1,3 +1,11 @@
+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)
+
+ -- tony mancill <tmancill at debian.org>  Sun, 06 Apr 2014 22:03:40 -0700
+
 java-wrappers (0.1.27) unstable; urgency=low
 
   * Prefer openJDK7 as the "java6" runtime (closes: #714748)

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2014-04-06 22:28:59 UTC (rev 17992)
+++ trunk/java-wrappers/jvm-list.sh	2014-04-07 05:18:37 UTC (rev 17993)
@@ -30,6 +30,9 @@
 # Sun runtimes
 __jvm_sun6="/usr/lib/jvm/java-6-sun /usr/lib/j2*1.6-sun"
 
+# Oracle runtimes
+__jvm_oracle7="/usr/lib/jvm/jdk-7-oracle-* /usr/lib/jvm/jre-7-oracle-*"
+
 # all sun runtimes
 __jvm_sun="$__jvm_sun6"
 # Sun version at least 5:
@@ -47,7 +50,7 @@
 __jvm_openjdk="$__jvm_openjdk7 $__jvm_openjdk6"
 
 # The java* runtimes:
-__jvm_java7="$__jvm_openjdk7"
+__jvm_java7="$__jvm_openjdk7 $__jvm_oracle7"
 # -> corresponds to Provides: java6-runtime 
 __jvm_java6="$__jvm_java7 $__jvm_openjdk6 $__jvm_sun6"
 # -> corresponds to Provides: java5-runtime