[apache2] 01/02: move Provides: httpd, httpd-cgi to apache2

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit f512a5896bd1b6e2bc3f67f38b798cc8cc363e66
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Aug 27 07:25:05 2014 +0200

    move Provides: httpd, httpd-cgi to apache2
---
 debian/changelog | 8 ++++++++
 debian/control   | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08d6d8d..d0f1e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.4.10-2) UNRELEASED; urgency=medium
+
+  * Switch to apache2 providing the httpd and httpd-cgi virtual packages.
+    The previously providing apache2-bin package lacks the configuration
+    files. Closes: #756361
+
+ -- Stefan Fritsch <sf at debian.org>  Wed, 27 Aug 2014 07:22:55 +0200
+
 apache2 (2.4.10-1) unstable; urgency=medium
 
   [ Arno Töll ]
diff --git a/debian/control b/debian/control
index 6bb8c2e..91468a9 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
  apache2-data (= ${source:Version}), ${perl:Depends}
 Replaces: apache2.2-common
 Conflicts: apache2.2-common (<< 2.3~)
+Provides: httpd, httpd-cgi
 Recommends: ssl-cert
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom,
  apache2-utils
@@ -49,7 +50,7 @@ Package: apache2-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 # MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
-Provides: ${apache2:API}, httpd, httpd-cgi
+Provides: ${apache2:API}
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Replaces: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~), apache2-mpm-prefork (<< 2.3~),
  apache2-mpm-itk (<< 2.3~), apache2-mpm-worker (<< 2.3~), apache2-mpm-event (<< 2.3~),

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