[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-53-g146d359

[Arno Töll]

The following commit has been merged in the master branch:
commit 146d3594edd3c5a6ad3b69eaaa6a0f83e113f53f
Author: Arno Töll <arno at debian.org>
Date:   Fri Aug 3 23:21:42 2012 +0200

    Fix the disk_cache upgrade logic again; build data.tar.xz members in binary packages

diff --git a/debian/apache2.2-common.postinst b/debian/apache2.2-common.postinst
index ee1b1e9..a730b9e 100644
--- a/debian/apache2.2-common.postinst
+++ b/debian/apache2.2-common.postinst
@@ -104,11 +104,17 @@ fi
 
 
 # Should run on upgrades from Squeeze or Testing only
-if dpkg --compare-versions "$2" lt 2.2.22-10; then
+# This code existed in parts 2.2.22-10 already but it wasn't complete.
+# Thus, users of 2.2.22-10 (only in Sid) enter here as well. That's not
+# optimal, but not a problem either.
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.22-11; then
 	if [ -d /var/cache/apache2/mod_disk_cache ] ; then
-		echo "Purging old mod_disk_cache cache data in /var/cache/apache2/mod_cache_disk/"
+		echo "Purging old mod_disk_cache cache data in /var/cache/apache2/mod_disk_cache"
+		if [ -d /var/cache/apache2/ ] && [ "$(stat -c '%U' /var/cache/apache2/)" = "www-data" ] ; then
+			 chown root:root /var/cache/apache2/
+		fi
 		rm -rf /var/cache/apache2/mod_disk_cache
-                install -o www-data -g www-data -d /var/cache/apache2/mod_disk_cache/
+		install -o www-data -g www-data -d /var/cache/apache2/mod_disk_cache/
 	fi
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 214e3cb..665b678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-apache2 (2.2.22-11) UNRELEASED; urgency=low
+apache2 (2.2.22-11) unstable; urgency=low
 
   * Be more careful regarding link attacks when purging the cache disk
     directory.
+  * Change file ownership of /var/cache/apache2/ to root.
+  * Compress the data.tar in binary packages using xz to save some space on
+    installation medias (Debian only).
 
- -- Arno Töll <arno at debian.org>  Thu, 02 Aug 2012 22:43:18 +0200
+ -- Arno Töll <arno at debian.org>  Fri, 03 Aug 2012 23:20:50 +0200
 
 apache2 (2.2.22-10) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ee169d0..df368d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -290,7 +290,7 @@ override_dh_builddeb:
 		sed -i '/apache2-dbg/d' debian/files; \
 		dh_builddeb -Napache2-dbg; \
 	else \
-		dh_builddeb; \
+		dh_builddeb -- -Zxz; \
 	fi
 
 override_dh_installlogrotate:

-- 
Debian packaging for apache2