[Pkg-apache-commits] r1197 - in /trunk/apache2: apache2.2-common.postrm changelog

[sf at alioth.debian.org]

Author: sf
Date: Thu May 27 20:05:44 2010
New Revision: 1197

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1197
Log:
Update the postrm script to also purge the version of /var/www/index.html
introduced in 2.2.11-7.

Modified:
    trunk/apache2/apache2.2-common.postrm
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.postrm
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.postrm?rev=1197&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.postrm (original)
+++ trunk/apache2/apache2.2-common.postrm Thu May 27 20:05:44 2010
@@ -67,10 +67,13 @@
 fi
 
 if [ "$1" = remove ] ; then
-	if [ "`md5sum /var/www/index.html 2>/dev/null | cut -d ' ' -f 1`" \
-	     = "5388f60d7695cb57b87c799ee62d20b2" ] ; then
-		rm /var/www/index.html
-	fi
+	MD5SUM="`md5sum /var/www/index.html 2>/dev/null | cut -d ' ' -f 1`"
+	case "$MD5SUM" in
+		5388f60d7695cb57b87c799ee62d20b2|\
+		21dde95d9d269cbb2fa6560309dca40c)
+			rm -f /var/www/index.html
+			;;
+	esac
 fi
 
 #DEBHELPER#

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1197&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Thu May 27 20:05:44 2010
@@ -1,6 +1,8 @@
 apache2 (2.2.15-6) UNRELEASED; urgency=low
 
   * Fix init script not correctly killing htcacheclean. Closes: #580971
+  * Update the postrm script to also purge the version of /var/www/index.html
+    introduced in 2.2.11-7.
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 11 May 2010 21:22:48 +0200