[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-15-gafc5456

[Arno Töll]

The following commit has been merged in the master branch:
commit afc545653d820369bbd4abb7f5d1c85dbf1df4ac
Author: Arno Töll <arno at debian.org>
Date:   Sat Jul 20 13:54:31 2013 +0200

    Also reinstall index.html when upgrading from Wheezy as its removed during the upgrade

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 177a949..b392e02 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -261,7 +261,7 @@ install_default_site()
 # scriptlet move there too?
 install_default_files()
 {
-	if is_fresh_install $@ ; then
+	if is_fresh_install $@ || we_are_upgrading_from_wheezy $@ ; then
 		if [ ! -e /var/www/index.html  -a \
 			! -h /var/www/index.html  -a \
 			! -e /var/www/index.cgi   -a \
diff --git a/debian/changelog b/debian/changelog
index 8010cce..8c83f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,13 +12,14 @@ apache2 (2.4.4-7) unstable; urgency=low
     checking the supplied arguments, we were off by one (Closes: #717299).
   * CVE-2013-1896: Add patch provided by Marc Deslauriers to fix a denial of service via MERGE
     request (Closes: #717272)
+  * Reinstall index.html also on upgrades as it is removed during upgrades.
 
   [ Stefan Fritsch ]
   * Don't fail package upgrade or removal just because the configuration is in
     an inconsistent state (Closes: #716921, #717343).
   * Improve error output of init script.
 
- -- Arno Töll <arno at debian.org>  Sat, 20 Jul 2013 13:26:50 +0200
+ -- Arno Töll <arno at debian.org>  Sat, 20 Jul 2013 13:50:41 +0200
 
 apache2 (2.4.4-6) unstable; urgency=low
 

-- 
Debian packaging for apache2