[apache2] branch master updated (be57de2 -> f42eb78)

[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  be57de2   Fix conffiles from wheezy upgrade
       new  a19f119   set SHELL=/bin/bash during configure for reproducible builds
       new  1314e70   dh_apache2: add missing options to the help summary
       new  f42eb78   Re-introduce mod_imagemap and mod_cern_meta

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/changelog                                | 3 +++
 debian/config-dir/mods-available/cern_meta.load | 1 +
 debian/config-dir/mods-available/imagemap.load  | 1 +
 debian/debhelper/dh_apache2.in                  | 1 +
 debian/rules                                    | 4 ++--
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 debian/config-dir/mods-available/cern_meta.load
 create mode 100644 debian/config-dir/mods-available/imagemap.load

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