[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-31-gbdf5d1a

[Arno Töll]

The following commit has been merged in the next branch:
commit bdf5d1a0f635d46c4b437a83f26b38b84e42f40b
Author: Arno Töll <arno at debian.org>
Date:   Thu May 30 10:36:31 2013 +0200

    More Squeeze -> Wheezy which I had forgotten apparently

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 513f2e9..177a949 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -55,7 +55,7 @@ WHEEZY_UPGRADE=0
 we_are_upgrading_from_wheezy()
 {
 	if [ -n "$2" ] && dpkg --compare-versions "$2" le-nl "2.3"; then
-		SQUEEZE_UPGRADE=1
+		WHEEZY_UPGRADE=1
 		return 0
 	fi
 
@@ -66,17 +66,17 @@ we_are_upgrading_from_wheezy()
 	fi
 
 	if [ -e /etc/apache2/.apache2_mpm_selected ] ; then
-		SQUEEZE_UPGRADE=1
+		WHEEZY_UPGRADE=1
 		return 0
 	fi
 
-	if [ "$SQUEEZE_UPGRADE" -eq 1 ] ; then
+	if [ "$WHEEZY_UPGRADE" -eq 1 ] ; then
 		return 0
 	fi
 
 	for CONFFILE in $OBSOLETE_CONFFILES ; do
 		if [ -e "$CONFFILE.dpkg-backup" ] || [ -e "$CONFFILE.dpkg-remove" ] ; then
-			SQUEEZE_UPGRADE=1
+			WHEEZY_UPGRADE=1
 			return 0
 		fi
 	done
@@ -84,7 +84,7 @@ we_are_upgrading_from_wheezy()
 	for CONFFILE in $MOVED_CONFFILES ; do
 		OLDCONFFILE=$( echo "$CONFFILE" | cut -d: -f1 )
 		if [ -e "$OLDCONFFILE.dpkg-remove" ] ; then
-			SQUEEZE_UPGRADE=1
+			WHEEZY_UPGRADE=1
 			return 0
 		fi
 	done
diff --git a/debian/changelog b/debian/changelog
index bef8161..8feedd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 apache2 (2.4.4-4) UNRELEASED; urgency=low
 
+  [ Stefan Fritsch ]
   * Fix FTBFS on hurd caused by mpm-itk linking fix.
   * Fix some lintian warnings:
     - fix pod error
     - add overrides for hardening-no-fortify-functions
 
- -- Stefan Fritsch <sf at debian.org>  Wed, 29 May 2013 22:47:31 +0200
+  [ Arno Töll ]
+  * Correct maintainer scripts by removing forgotten left-overs of our Squeeze
+    -> Wheezy renaming
+
+ -- Arno Töll <arno at debian.org>  Thu, 30 May 2013 10:34:17 +0200
 
 apache2 (2.4.4-3) experimental; urgency=low
 

-- 
Debian packaging for apache2