[pkg-java] r11500 - trunk/tomcat6/debian

[Jason Brittain]

Author: jasonb-guest
Date: 2010-02-05 02:32:36 +0000 (Fri, 05 Feb 2010)
New Revision: 11500

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/tomcat6.init
Log:
* Fixed a bug in the init script: When a start fails, the PID file was
  being left in place.  Now the init script makes sure it is deleted.
* Fixed a packaging bug that results in the ROOT webapp not being properly
  installed after an uninstall, then a reinstall.
* control: Corrected a couple of comments (no functional change).


Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-02-05 00:03:53 UTC (rev 11499)
+++ trunk/tomcat6/debian/changelog	2010-02-05 02:32:36 UTC (rev 11500)
@@ -1,5 +1,6 @@
 tomcat6 (6.0.24-1) UNRELEASED; urgency=low
 
+  [ Ludovic Claude ]
   * New upstream version
   * Bump up Standards-Version to 3.8.4
   * Refresh patches deploy-webapps-build-xml.patch and var_loaders.patch
@@ -13,8 +14,15 @@
     documentation in the tomcat6 package and add some useful notes. 
     (Closes: #563937, #563939)
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 31 Jan 2010 23:06:51 +0100
+  [ Jason Brittain ]
+  * Fixed a bug in the init script: When a start fails, the PID file was
+    being left in place.  Now the init script makes sure it is deleted.
+  * Fixed a packaging bug that results in the ROOT webapp not being properly
+    installed after an uninstall, then a reinstall.
+  * control: Corrected a couple of comments (no functional change).
 
+ -- Jason Brittain <jason.brittain at mulesoft.com>  Wed, 04 Feb 2010 18:29:48 +0000
+
 tomcat6 (6.0.20-dfsg1-2) unstable; urgency=low
 
   * JSVC is no longer used by the package.  Instead, the init script invokes

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2010-02-05 00:03:53 UTC (rev 11499)
+++ trunk/tomcat6/debian/control	2010-02-05 02:32:36 UTC (rev 11500)
@@ -34,13 +34,12 @@
 Description: Servlet and JSP engine
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
- server environment for Java code to run. Tomcat 6 is the reference
- implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies.
+ server environment for Java code to run.
  .
  This package just contains the startup scripts for the system-wide daemon.
  No documentation or web applications are included here, please install
  the tomcat6-docs and tomcat6-examples packages if you want them.
- Install the authbind package if you need to use Tomcat on ports 0-1024
+ Install the authbind package if you need to use Tomcat on ports 1-1023.
 
 Package: tomcat6-user
 Architecture: all

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2010-02-05 00:03:53 UTC (rev 11499)
+++ trunk/tomcat6/debian/tomcat6.init	2010-02-05 02:32:36 UTC (rev 11500)
@@ -196,6 +196,9 @@
         	if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
 			--user $TOMCAT6_USER --exec "$JAVA_HOME/bin/java" \
 			>/dev/null; then
+			if [ -f "$CATALINA_PID" ]; then
+				rm -f "$CATALINA_PID"
+			fi
 			log_end_msg 1
 		else
 			log_end_msg 0