diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-08-22 16:21:52 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-08-22 16:27:02 +0200 |
| commit | b878c31bd67353574517ce8de79f3f4e398602c4 (patch) | |
| tree | 27413321f2f26e1bcedf558212c3dcf25a5e2110 | |
| parent | 7fcc8ce6a787ddead33b71cd030c0c012fa54f0b (diff) | |
| download | apache2-b878c31bd67353574517ce8de79f3f4e398602c4.tar.gz | |
Conflict with apache2.2-common and apache2.2-bin
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 36a1554e..83e2c78c 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 c7525697..7239f64a 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 |