[apache2] branch master updated (5eb37e9 -> 237b6b8)

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a change to branch master
in repository apache2.

      from  5eb37e9   Fix error handling in is_problematic_index_html() in postinst
       new  237b6b8   Fix conffiles from wheezy upgrade

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/apache2.postinst   | 20 ++++++++++
 debian/apache2.preinst.in | 96 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog          |  7 ++++
 debian/clean              |  3 ++
 debian/create_preinst     | 32 ++++++++++++++++
 debian/rules              | 17 ++++++++-
 6 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 debian/apache2.preinst.in
 create mode 100755 debian/create_preinst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git