[apache2] 01/01: Conflict with apache2.2-common and apache2.2-bin

[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 b878c31bd67353574517ce8de79f3f4e398602c4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Aug 22 16:21:52 2015 +0200

    Conflict with apache2.2-common and apache2.2-bin
---
 debian/changelog | 2 ++
 debian/control   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 36a1554..83e2c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apache2 (2.4.16-4) UNRELEASED; urgency=medium
 
   [ Stefan Fritsch ]
   * reproducible build: Make symbol sorting consistent over different locales
+  * Conflict with apache2.2-common and apache2.2-bin to get the transitional
+    packages removed. Closes: #768815
 
   [ Jean-Michel Vourgère ]
   * Updated upstream keyring used to check source authenticity.
diff --git a/debian/control b/debian/control
index c752569..7239f64 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
  ${perl:Depends}
 Provides: httpd, httpd-cgi
 Recommends: ssl-cert
+Conflicts: apache2.2-common, apache2.2-bin
+Replaces: apache2.2-common, apache2.2-bin
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Description: Apache HTTP Server
  The Apache HTTP Server Project's goal is to build a secure, efficient and

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