[pkg-java] r18027 - trunk/jetty/debian

[Eugene Zhukov]

Author: eugene-guest
Date: 2014-04-11 16:45:38 +0000 (Fri, 11 Apr 2014)
New Revision: 18027

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/jetty.init
Log:
incorporated patch from #675027

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2014-04-11 15:01:39 UTC (rev 18026)
+++ trunk/jetty/debian/changelog	2014-04-11 16:45:38 UTC (rev 18027)
@@ -3,6 +3,8 @@
   * Team upload.
   * Bumped to Standard-Versions 3.9.5 - no changes required.
   * Switched to libtomcat7-java (Closes: #686876)
+  * Added detection to init script for openjdk-8, openjdk-7
+    and openjdk-6 multiarch installations (Closes: #675027)
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Fri, 11 Apr 2014 11:35:28 +0000
 

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2014-04-11 15:01:39 UTC (rev 18026)
+++ trunk/jetty/debian/jetty.init	2014-04-11 16:45:38 UTC (rev 18027)
@@ -119,6 +119,9 @@
 # defined in /etc/default/jetty). Should contain a list of space separated directories.
 JDK_DIRS="
 	  /usr/lib/jvm/default-java \
+	  /usr/lib/jvm/java-1.8.0-openjdk-* \
+	  /usr/lib/jvm/java-1.7.0-openjdk-* \
+	  /usr/lib/jvm/java-1.6.0-openjdk-* \
 	  /usr/lib/jvm/java-6-sun \
 	  /usr/lib/jvm/java-6-openjdk \
 	  /usr/lib/jvm/java-1.5.0-sun \