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

[Marcus Better]

Author: marcusb-guest
Date: 2006-10-23 11:30:02 +0000 (Mon, 23 Oct 2006)
New Revision: 2651

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/tomcat5.5-admin.postinst
   trunk/tomcat5.5/debian/tomcat5.5-admin.prerm
   trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst
   trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm
   trunk/tomcat5.5/debian/tomcat5.5.postinst
Log:
Don't call init script directly.


Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/changelog	2006-10-23 11:30:02 UTC (rev 2651)
@@ -5,8 +5,10 @@
     from libservlet2.4-java. (Closes: #393905)
   * debian/control: Add some missing dependencies.
   * Enable commons-daemon functionality, it should work correctly by now.
+  * Make init script LSB compliant.
+  * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
 
- -- Marcus Better <marcus at better.se>  Wed, 18 Oct 2006 12:57:19 +0200
+ -- Marcus Better <marcus at better.se>  Mon, 23 Oct 2006 13:28:15 +0200
 
 tomcat5.5 (5.5.17-2) unstable; urgency=low
 

Modified: trunk/tomcat5.5/debian/tomcat5.5-admin.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.postinst	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.postinst	2006-10-23 11:30:02 UTC (rev 2651)
@@ -8,18 +8,10 @@
 	    # New installation, not a package upgrade
 	    if [ -x /etc/init.d/tomcat5.5 ]; then
 	        # Only restart tomcat if it is already running
-		if /etc/init.d/tomcat5.5 status >/dev/null; then
-		    /etc/init.d/tomcat5.5 force-reload
+		if invoke-rc.d tomcat5.5 status >/dev/null; then
+		    invoke-rc.d tomcat5.5 force-reload
 		fi
 	    fi
 	fi
     ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" >&2
-	exit 1
-    ;;
 esac

Modified: trunk/tomcat5.5/debian/tomcat5.5-admin.prerm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.prerm	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.prerm	2006-10-23 11:30:02 UTC (rev 2651)
@@ -3,22 +3,13 @@
 #DEBHELPER#
 
 case "$1" in
-    upgrade|failed-upgrade)
-        # Nothing to do here
-    ;;
-
     deconfigure|remove)
 	# Remove the webapp if this is not an upgrade
 	if [ -x /etc/init.d/tomcat5.5 ]; then
 	    # Only restart tomcat if it is already running
-	    if /etc/init.d/tomcat5.5 status >/dev/null; then
-		/etc/init.d/tomcat5.5 force-reload || true
+	    if invoke-rc.d tomcat5.5 status >/dev/null; then
+		invoke-rc.d tomcat5.5 force-reload || true
 	    fi
 	fi
     ;;
-
-    *)
-        echo "$0 called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
 esac

Modified: trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst	2006-10-23 11:30:02 UTC (rev 2651)
@@ -8,18 +8,10 @@
 	    # New installation, not a package upgrade
 	    if [ -x /etc/init.d/tomcat5.5 ]; then
 	        # Only restart tomcat if it is already running
-		if /etc/init.d/tomcat5.5 status >/dev/null; then
-		    /etc/init.d/tomcat5.5 force-reload
+		if invoke-rc.d tomcat5.5 status >/dev/null; then
+		    invoke-rc.d tomcat5.5 force-reload
 		fi
 	    fi
 	fi
     ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" >&2
-	exit 1
-    ;;
 esac

Modified: trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm	2006-10-23 11:30:02 UTC (rev 2651)
@@ -3,22 +3,13 @@
 #DEBHELPER#
 
 case "$1" in
-    upgrade|failed-upgrade)
-        # Nothing to do here
-    ;;
-
     deconfigure|remove)
 	# Remove the webapp if this is not an upgrade
 	if [ -x /etc/init.d/tomcat5.5 ]; then
 	    # Only restart tomcat if it is already running
-	    if /etc/init.d/tomcat5.5 status >/dev/null; then
-		/etc/init.d/tomcat5.5 force-reload || true
+	    if invoke-rc.d tomcat5.5 status >/dev/null; then
+		invoke-rc.d tomcat5.5 force-reload || true
 	    fi
 	fi
     ;;
-
-    *)
-        echo "$0 called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
 esac

Modified: trunk/tomcat5.5/debian/tomcat5.5.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postinst	2006-10-23 11:29:49 UTC (rev 2650)
+++ trunk/tomcat5.5/debian/tomcat5.5.postinst	2006-10-23 11:30:02 UTC (rev 2651)
@@ -23,26 +23,11 @@
 		/usr/share/tomcat5.5/.debian/tomcat-users.xml \
 		/var/lib/tomcat5.5/conf/
 	fi
-# this file is no more present
-#	if [ ! -f /var/lib/tomcat5.5/conf/jk2.properties ]; then
-#	    echo "Installing /var/lib/tomcat5.5/conf/jk2.properties"
-#	    install -o tomcat5 -g nogroup -m 644 \
-#		/usr/share/tomcat5.5/.debian/jk2.properties \
-#		/var/lib/tomcat5.5/conf/
-#	fi
 	if [ -f /etc/tomcat5.5/tomcat-users.xml ]; then
 	    mv /etc/tomcat5.5/tomcat-users.xml \
 		/etc/tomcat5.5/tomcat-users.xml.dpkg-old || true
 	fi
     ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" >&2
-	exit 1
-    ;;
 esac
 
 #DEBHELPER#