[tomcat8] 04/05: Support the JVMs installed by java-package (<< 0.52) and webupd8 (Closes: #769166)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit a1418545b0c57e09116b68307ac9a2184ea3b30a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 30 19:00:44 2015 +0200

    Support the JVMs installed by java-package (<< 0.52) and webupd8 (Closes: #769166)
---
 debian/changelog    | 2 ++
 debian/tomcat8.init | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c696256..bb9255d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ tomcat8 (8.0.21-1) UNRELEASED; urgency=medium
     - Refreshed the patches
   * debian/orig-tar.sh: Exclude the taglibs-standard-*.jar files
     from the upstream tarball
+  * Support the JVMs installed by the older versions of java-package (<< 0.52)
+    and the oracle-java<n>-installer packages from webupd8 (Closes: #769166)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 30 Mar 2015 17:16:18 +0200
 
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index 774c08a..cd76a0b 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -62,7 +62,8 @@ find_jdks()
     do
         for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
                       /usr/lib/jvm/jdk-${java_version}-oracle-* \
-                      /usr/lib/jvm/jre-${java_version}-oracle-*
+                      /usr/lib/jvm/jre-${java_version}-oracle-* \
+                      /usr/lib/jvm/java-${java_version}-oracle
         do
             if [ -d "${jvmdir}" ]
             then
@@ -71,8 +72,8 @@ find_jdks()
         done
     done
 
-    # Add older non multi arch installations
-    JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/java-7-oracle"
+    # Add the paths for the JVMs packaged by the older versions of java-package (<< 0.52 as in Wheezy and Trusty)
+    JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/j2re1.7-oracle /usr/lib/jvm/j2sdk1.7-oracle"
 }
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not

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