[java-wrappers] 58/61: Support the JVMs installed by the webupd8 installer (Closes: #799270)

[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 63b338f95a8b71a9063f6609207adea155992384
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 24 18:03:42 2017 +0200

    Support the JVMs installed by the webupd8 installer (Closes: #799270)
---
 debian/changelog | 1 +
 jvm-list.sh      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcb3a52..02fbc17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 java-wrappers (0.1.29) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Support the JVMs installed by the webupd8 installer (Closes: #799270)
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/jvm-list.sh b/jvm-list.sh
index 2294627..50c947e 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -31,8 +31,8 @@ __jvm_default="/usr/lib/jvm/default-java"
 __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-*"
+__jvm_oracle7="/usr/lib/jvm/java-7-oracle /usr/lib/jvm/jdk-7-oracle-* /usr/lib/jvm/jre-7-oracle-*"
+__jvm_oracle8="/usr/lib/jvm/java-8-oracle /usr/lib/jvm/jdk-8-oracle-* /usr/lib/jvm/jre-8-oracle-*"
 
 # all sun runtimes
 __jvm_sun="$__jvm_sun6"

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