[apache2] branch master updated (b2eb373 -> 04bd3cf)

[Arno Töll]

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

atoell-guest pushed a change to branch master
in repository apache2.

      from  b2eb373   Provide httpd in transitional packages
       new  8e85857   Drop the itk package, it is provided as from its own source package in future
       new  0c1cfd0   Fix the regression introduced in 0f878d00 which prevented to detect the MPM in preinst
       new  04bd3cf   Remove 'XXX:' annotation from the text file shipped to users

The 3 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/a2query.in                                  |    2 +-
 debian/apache2.NEWS                                |    5 +
 debian/apache2.README.Debian                       |    2 -
 debian/apache2.postinst                            |    6 +-
 debian/apache2.preinst                             |    1 -
 debian/changelog                                   |   10 +-
 debian/config-dir/mods-available/mpm_itk.conf      |   17 -
 debian/config-dir/mods-available/mpm_itk.load      |    2 -
 debian/control                                     |    4 +-
 ...htaccess-reads-for-persistent-connections.patch |   61 --
 debian/patches/itk-rerun-configure.patch           |  784 --------------------
 debian/patches/itk/02-rename-prefork-to-itk.patch  |  294 --------
 debian/patches/itk/05-add-copyright.patch          |   36 -
 debian/patches/itk/07-base-functionality.patch     |  229 ------
 debian/patches/itk/08-max-clients-per-vhost.patch  |   99 ---
 debian/patches/itk/09-capabilities.patch           |   59 --
 debian/patches/itk/10-nice.patch                   |  140 ----
 ...htaccess-reads-for-persistent-connections.patch |   23 -
 debian/patches/itk/README                          |    5 -
 debian/patches/itk/series                          |   12 -
 debian/patches/series                              |   10 -
 debian/rules                                       |   20 +-
 22 files changed, 23 insertions(+), 1798 deletions(-)
 delete mode 100644 debian/config-dir/mods-available/mpm_itk.conf
 delete mode 100644 debian/config-dir/mods-available/mpm_itk.load
 delete mode 100644 debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
 delete mode 100644 debian/patches/itk-rerun-configure.patch
 delete mode 100644 debian/patches/itk/02-rename-prefork-to-itk.patch
 delete mode 100644 debian/patches/itk/05-add-copyright.patch
 delete mode 100644 debian/patches/itk/07-base-functionality.patch
 delete mode 100644 debian/patches/itk/08-max-clients-per-vhost.patch
 delete mode 100644 debian/patches/itk/09-capabilities.patch
 delete mode 100644 debian/patches/itk/10-nice.patch
 delete mode 100644 debian/patches/itk/11-fix-htaccess-reads-for-persistent-connections.patch
 delete mode 100644 debian/patches/itk/README
 delete mode 100644 debian/patches/itk/series

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