[Pkg-apache-commits] r890 - in /branches/lenny-apache2: apache2.2-common.postinst changelog

[sf at alioth.debian.org]

Author: sf
Date: Mon Mar  2 21:19:09 2009
New Revision: 890

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=890
Log:
Take care to not override existing index.shtml files when upgrading from
before 2.2.8-1 (closes: #517089).

Modified:
    branches/lenny-apache2/apache2.2-common.postinst
    branches/lenny-apache2/changelog

Modified: branches/lenny-apache2/apache2.2-common.postinst
URL: http://svn.debian.org/wsvn/pkg-apache/branches/lenny-apache2/apache2.2-common.postinst?rev=890&op=diff
==============================================================================
--- branches/lenny-apache2/apache2.2-common.postinst (original)
+++ branches/lenny-apache2/apache2.2-common.postinst Mon Mar  2 21:19:09 2009
@@ -101,6 +101,7 @@
 	     ! -e /var/www/index.pl    -a \
 	     ! -e /var/www/index.php   -a \
 	     ! -e /var/www/index.xhtml -a \
+	     ! -e /var/www/index.shtml -a \
 	     ! -e /var/www/index.htm ] ; then
 		cp /usr/share/apache2/default-site/index.html /var/www/index.html
 	fi

Modified: branches/lenny-apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/lenny-apache2/changelog?rev=890&op=diff
==============================================================================
--- branches/lenny-apache2/changelog (original)
+++ branches/lenny-apache2/changelog Mon Mar  2 21:19:09 2009
@@ -1,3 +1,10 @@
+apache2 (2.2.9-10+lenny3) UNRELEASED; urgency=low
+
+  * Take care to not override existing index.shtml files when upgrading from
+    before 2.2.8-1 (closes: #517089).
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 02 Mar 2009 22:16:34 +0100
+
 apache2 (2.2.9-10+lenny2) testing-proposed-updates; urgency=low
 
   * Report an error instead instead of segfaulting when apr_pollset_create