r2406 - trunk/tomcat5/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-09-12 14:50:59 +0000 (Tue, 12 Sep 2006)
New Revision: 2406

Modified:
   trunk/tomcat5/debian/changelog
   trunk/tomcat5/debian/tomcat5.init
Log:
added the path from Sun package in init script

Modified: trunk/tomcat5/debian/changelog
===================================================================
--- trunk/tomcat5/debian/changelog	2006-09-12 14:50:45 UTC (rev 2405)
+++ trunk/tomcat5/debian/changelog	2006-09-12 14:50:59 UTC (rev 2406)
@@ -5,6 +5,9 @@
     + debian/control: removed apache-utils version and added alternative
     apache2-utils (that provide the virtual apache-utils package) (closes:
     #361277)
+    + debian/tomcat5.init: added Sun's jdk path as provided by
+    sun-java5-bin package (closes: #386394). I also added IBM's
+    packages.
 
  --
 

Modified: trunk/tomcat5/debian/tomcat5.init
===================================================================
--- trunk/tomcat5/debian/tomcat5.init	2006-09-12 14:50:45 UTC (rev 2405)
+++ trunk/tomcat5/debian/tomcat5.init	2006-09-12 14:50:59 UTC (rev 2406)
@@ -20,7 +20,7 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/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/jvm/java-gcj /usr/lib/kaffe"
+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"
 
 # Directory for per-instance configuration files and webapps
 CATALINA_BASE=/var/lib/tomcat5