[tomcat8] 01/01: Restored the detection of the Java 7 runtimes

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/8.5.11-1_bpo8+2
in repository tomcat8.

commit f45953bc3d09ef3e2f74aef52da9bab0a43d743a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 30 15:22:22 2017 +0100

    Restored the detection of the Java 7 runtimes
---
 debian/changelog    | 6 ++++++
 debian/tomcat8.init | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44566d1..a8bd502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tomcat8 (8.5.11-1~bpo8+2) jessie-backports; urgency=medium
+
+  * Restored the detection of the Java 7 runtimes
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 30 Jan 2017 15:22:00 +0100
+
 tomcat8 (8.5.11-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index 44fa6be..4fe223a 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -58,7 +58,7 @@ TOMCAT8_GROUP=tomcat8
 # this function sets the variable JDK_DIRS
 find_jdks()
 {
-    for java_version in 9 8
+    for java_version in 9 8 7
     do
         for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
                       /usr/lib/jvm/jdk-${java_version}-oracle-* \
@@ -71,6 +71,9 @@ find_jdks()
             fi
         done
     done
+
+    # 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