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

[Thierry Carrez]

Author: ttx-guest
Date: 2010-10-15 12:26:15 +0000 (Fri, 15 Oct 2010)
New Revision: 13029

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.postrm
Log:
Do not fail to purge if /etc/tomcat6 was manually removed (LP: #648619)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-10-15 09:29:16 UTC (rev 13028)
+++ trunk/tomcat6/debian/changelog	2010-10-15 12:26:15 UTC (rev 13029)
@@ -1,3 +1,9 @@
+tomcat6 (6.0.28-8) UNRELEASED; urgency=low
+
+  * Do not fail to purge if /etc/tomcat6 was manually removed (LP: #648619)
+
+ -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Fri, 15 Oct 2010 14:23:23 +0200
+
 tomcat6 (6.0.28-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/tomcat6/debian/tomcat6.postrm
===================================================================
--- trunk/tomcat6/debian/tomcat6.postrm	2010-10-15 09:29:16 UTC (rev 13028)
+++ trunk/tomcat6/debian/tomcat6.postrm	2010-10-15 12:26:15 UTC (rev 13029)
@@ -56,7 +56,7 @@
           /etc/tomcat6/Catalina/localhost /etc/tomcat6/Catalina /etc/tomcat6
         # Put all files owned by group tomcat6 back into root group before deleting
         # the tomcat6 user and group
-        chown -Rhf root:root /etc/tomcat6/
+        chown -Rhf root:root /etc/tomcat6/ || true
         # Remove user/group and log files (don't remove everything under
         # /var/lib/tomcat6 because there might be user-installed webapps)
         deluser tomcat6