[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.26-1-7-gb118bd2

[tony mancill]

The following commit has been merged in the master branch:
commit 392a2b0dddd87673b7c4d3480a9cdf8d112cc1ec
Author: tony mancill <tmancill at debian.org>
Date:   Thu Apr 26 21:15:20 2012 -0700

    update md5sum for default_root files; clean up authbind files

diff --git a/debian/changelog b/debian/changelog
index 284aa3f..92aa88e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
 tomcat7 (7.0.26-2) UNRELEASED; urgency=low
 
   [ tony mancill ]
-  * Add Turkish debconf translation.  (Closes: #664683)
+  * Add Turkish debconf translation. (Closes: #664683)
     - Thanks to Atila KOÇ
   * Add patch to tomcat7-instance-create to handle paths with spaces.
     - Thanks to James Page.
+  * Remove /etc/authbind/byuid, /etc/authbind in postrm.
+    Update md5sum for default webapps root files. (Closes: #670440)
 
   [ Jakub Adam ]
   * Update OSGi metadata, use jh_manifest for modifying MANIFEST.MF.
 
- -- tony mancill <tmancill at debian.org>  Thu, 12 Apr 2012 20:03:23 -0700
+ -- tony mancill <tmancill at debian.org>  Thu, 26 Apr 2012 20:59:52 -0700
 
 tomcat7 (7.0.26-1) unstable; urgency=low
 
diff --git a/debian/tomcat7.postrm b/debian/tomcat7.postrm
index f43d5e1..0c013c7 100644
--- a/debian/tomcat7.postrm
+++ b/debian/tomcat7.postrm
@@ -14,7 +14,7 @@ case "$1" in
         RWLOC="/var/lib/tomcat7/webapps/ROOT"
         RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
         if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
-                            = "c05987dd6c6bcbd651889e9a0ec98ade" ] ; then
+                            = "570f093194741c60ee21adeaedca8af4" ] ; then
             rm $RWFILES
             rmdir --ignore-fail-on-non-empty \
                 /var/lib/tomcat7/webapps/ROOT/META-INF \
@@ -54,6 +54,8 @@ case "$1" in
         fi
         rmdir --ignore-fail-on-non-empty /etc/tomcat7/policy.d \
           /etc/tomcat7/Catalina/localhost /etc/tomcat7/Catalina /etc/tomcat7
+        # 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 tomcat7 back into root group before deleting
         # the tomcat7 user and group
         chown -Rhf root:root /etc/tomcat7/ || true

-- 
tomcat7: Servlet and JSP engine