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

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-22 16:30:39 +0100 (Wed, 22 Nov 2006)
New Revision: 2785

Modified:
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
Log:
Reflect changed webapp install dir.


Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-22 10:54:04 UTC (rev 2784)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-22 15:30:39 UTC (rev 2785)
@@ -10,10 +10,9 @@
         # Remove user and log files (don't remove everything under
 	# /var/lib/tomcat5.5 because there might be user-installed webapps)
 	userdel tomcat55 || true
-	rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
-	rmdir --ignore-fail-on-non-empty /var/lib/tomcat5.5/webapps \
-	    /var/lib/tomcat5.5
-	rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5
+	rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/{conf,temp}
+	rmdir --ignore-fail-on-non-empty /var/lib/tomcat5.5 || true
+	rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5 || true
     # remove user tomcat5 if package tomcat5 is 
     # marked as purged or has never been installed
     if [ -n "$(dpkg -l tomcat5 | grep pn)" -o -n "$(dpkg -l tomcat5 | grep un)" ]