summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@debian.org>2006-10-22 14:28:30 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:38 +0100
commit917d62399f58fab7082d0a399ec83dd1875da7ba (patch)
treeede5bff878addbb9abcb40967ef2d6822c01f8df
parent60eed0c2a623e6b54d5a1600b73b5ebae8526b86 (diff)
downloadapache2-917d62399f58fab7082d0a399ec83dd1875da7ba.tar.gz
Add alternate dependency from apache to apache2-mpm-event
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@253 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 30a50cc0..f096c6ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ apache2 (2.2.3-3) UNRELEASED; urgency=medium
Closes: #384128
* Provide sample disk and memory cache configurations. Closes: #278564
* Provide dir.conf. Closes: #392356
+ * Add alternate dependency from apache to apache2-mpm-event
[ Adam Conrad ]
* Update our php4 and php5 conflicts, to reflect the reality that each
diff --git a/debian/control b/debian/control
index c7bf39e2..87dd08af 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Description: utility programs for webservers
Package: apache2
Architecture: all
-Depends: apache2-mpm-worker|apache2-mpm-prefork
+Depends: apache2-mpm-worker | apache2-mpm-prefork | apache2-mpm-event
Section: web
Description: Next generation, scalable, extendable web server
Apache v2 is the next generation of the omnipresent Apache web server. This