[pkg-java] r7114 - trunk/tomcat5.5/debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2008-10-05 11:53:44 +0000 (Sun, 05 Oct 2008)
New Revision: 7114

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/tomcat5.5.init
Log:
Revert to 5.5.26-2 release.

Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2008-10-05 08:49:25 UTC (rev 7113)
+++ trunk/tomcat5.5/debian/changelog	2008-10-05 11:53:44 UTC (rev 7114)
@@ -1,11 +1,3 @@
-tomcat5.5 (5.5.26-3) UNRELEASED; urgency=low
-
-  * Recognize OpenJDK 6 from the openjdk-6-jdk package.
-  * Do not attempt to launch the daemon if the tomcat5.5 package was been
-    removed but not purged.
-
- -- Marcus Better <marcus at better.se>  Mon, 11 Aug 2008 12:44:19 +0000
-
 tomcat5.5 (5.5.26-2) unstable; urgency=low
 
   * Fixed bootstrap.MF to put commons-logging-api.jar onto classpath instead

Modified: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init	2008-10-05 08:49:25 UTC (rev 7113)
+++ trunk/tomcat5.5/debian/tomcat5.5.init	2008-10-05 11:53:44 UTC (rev 7114)
@@ -27,8 +27,6 @@
 CATALINA_HOME=/usr/share/$NAME
 DEFAULT=/etc/default/$NAME
 
-[ -r $CATALINA_HOME/bin/startup.sh ] || exit 0
-
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
 	exit 1
@@ -50,7 +48,7 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /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"
+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