This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit 74f95ceaeaa1347e5ae65fef1cb11128a3f9f127 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 2 10:25:58 2015 +0100 Support the JVMs installed by java-package (<< 0.52) and oracle-java{n > 7}-installer from webupd8 --- debian/changelog | 2 ++ debian/jetty8.init | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff35961..ea325dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ jetty8 (8.1.18-3) UNRELEASED; urgency=medium + * Support the JVMs installed by the older versions of java-package (<< 0.52) + and the oracle-java{n > 7}-installer packages from webupd8. * Updated the error message displayed when the JAVA_HOME variable defined in /etc/default/jetty8 doesn't point to a JRE. diff --git a/debian/jetty8.init b/debian/jetty8.init index d83154a..1ebac88 100644 --- a/debian/jetty8.init +++ b/debian/jetty8.init @@ -123,7 +123,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}" -a "${jvmdir}" != "/usr/lib/jvm/java-${java_version}-openjdk-common" ] then @@ -132,8 +133,8 @@ find_jdks() done done - # Add older non multi arch installations - JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /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 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" } # 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/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
