[SCM] tomcat6 packaging branch, master, updated. debian/6.0.35-2-7-g2cfc46b

[tony mancill]

The following commit has been merged in the master branch:
commit 36772d1de1782fa4a4021b29c1f67b906da1c5b5
Author: tony mancill <tmancill at debian.org>
Date:   Sat Apr 14 10:35:38 2012 -0700

    clean up /etc/authbind in postrm; #668761

diff --git a/debian/changelog b/debian/changelog
index 687525c..a580ab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ tomcat6 (6.0.35-3) unstable; urgency=low
 
   [ tony mancill ]
   * Add libservlet2.4-java transitional package.
+  * Remove /etc/authbind/byuid and /etc/authbind in postrm. 
+    (Closes: #668761)
 
- -- tony mancill <tmancill at debian.org>  Thu, 12 Apr 2012 08:10:57 -0700
+ -- tony mancill <tmancill at debian.org>  Sat, 14 Apr 2012 10:32:02 -0700
 
 tomcat6 (6.0.35-2) unstable; urgency=low
 
diff --git a/debian/tomcat6.postrm b/debian/tomcat6.postrm
index addd017..1ebe7cb 100644
--- a/debian/tomcat6.postrm
+++ b/debian/tomcat6.postrm
@@ -54,6 +54,8 @@ case "$1" in
         fi
         rmdir --ignore-fail-on-non-empty /etc/tomcat6/policy.d \
           /etc/tomcat6/Catalina/localhost /etc/tomcat6/Catalina /etc/tomcat6
+	# clean up /etc/authbind after conffiles have been removed 
+        rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind 
         # Put all files owned by group tomcat6 back into root group before deleting
         # the tomcat6 user and group
         chown -Rhf root:root /etc/tomcat6/ || true

-- 
tomcat6 packaging