[pkg-java] r3381 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2007-04-27 17:00:15 +0000 (Fri, 27 Apr 2007)
New Revision: 3381

Modified:
   branches/tomcat5.5/feature/debian/debian/changelog
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
Log:
Add sun-java6-jdk to list of supported JDKs.


Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog	2007-04-27 16:29:27 UTC (rev 3380)
+++ branches/tomcat5.5/feature/debian/debian/changelog	2007-04-27 17:00:15 UTC (rev 3381)
@@ -12,6 +12,7 @@
   * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
     "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
     <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
+  * Recognise Sun JDK 6 from the sun-java6-jdk package.
   * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
     Baer from Uploaders.
 

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-27 16:29:27 UTC (rev 3380)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-27 17:00:15 UTC (rev 3381)
@@ -37,7 +37,7 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/jvm/java-gcj /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do