[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 255c7dd4d4f9629e9f30181c5f4c4455b5adbe1e

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 56fec846330a78c8c4e23d73531e12843cdf431b
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Mar 14 23:41:27 2012 +0100

    Treat old version of httpd.conf as unchanged
    
    This version came with some 2.0.x package

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 8219e0e..7e5e904 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -298,7 +298,9 @@ move_httpd_conf()
         if we_are_upgrading_from_squeeze $@ ; then
 		if [ -e /etc/apache2/httpd.conf ] && [ -f /etc/apache2/httpd.conf ] ; then
 			local md5sum="$(md5sum /etc/apache2/httpd.conf | sed -e 's/ .*//')"
-			if [ $md5sum = "d41d8cd98f00b204e9800998ecf8427e" ] ;	then
+			if [ $md5sum = "d41d8cd98f00b204e9800998ecf8427e" ] ||
+			   [ $md5sum = "a20c3e53dd07836481a5e64bc71e1a33" ]
+			then
 				echo "Remove obsolete configuration file /etc/apache2/httpd.conf"
 				rm -f /etc/apache2/httpd.conf
 			else

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)