[java-wrappers] 52/61: update java-wrappers to detect JDK 8/java8

[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 9ba144cef698d52df891ff9c89c7fb3d5c04777a
Author: Tony Mancill <tmancill at debian.org>
Date:   Tue Apr 8 04:47:39 2014 +0000

    update java-wrappers to detect JDK 8/java8
---
 debian/changelog | 4 ++--
 jvm-list.sh      | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c400e2a..76e9f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/jvm-list.sh b/jvm-list.sh
index 8c97a3e..2294627 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -32,6 +32,7 @@ __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-*"
+__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_gcj2="/usr/lib/jvm/java-*-gcj-4.* "
 __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_gcj="$__jvm_gcj2"
 __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 

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