summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@debian.org>2006-10-29 22:09:49 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:39 +0100
commitf4943b0699bc11a916a57a42d9ace37b348e3d19 (patch)
tree322a16085cdb2063aa855c2233b14a211d2535b4 /debian/control
parent477ee730ae592a6da5f4aebcf49173fda6e2104a (diff)
downloadapache2-f4943b0699bc11a916a57a42d9ace37b348e3d19.tar.gz
Make apache2 MPMs provide and conflict with apache2-mpm so other packages can
provide MPMs too. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@264 01b336ce-410b-0410-9a02-a0e7f243c266
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 8c5a5b7e..a87ebb69 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,8 @@ Description: Next generation, scalable, extendable web server
Package: apache2-mpm-worker
Architecture: any
Depends: ${shlibs:Depends}, apache2.2-common (= ${Source-Version})
-Provides: apache2-modules, apache2, httpd, httpd-cgi
-Conflicts: apache2-mpm-prefork, apache2-mpm-event, apache2-common
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
Replaces: apache2-mpm-threadpool (<< 2.0.53), apache2-mpm-perchild (<< 2.2.0)
Description: High speed threaded model for Apache HTTPD 2.1
The worker MPM provides a threaded implementation for Apache HTTPD 2.1. It is
@@ -39,8 +39,8 @@ Description: High speed threaded model for Apache HTTPD 2.1
Package: apache2-mpm-prefork
Architecture: any
Depends: ${shlibs:Depends}, apache2.2-common (= ${Source-Version})
-Provides: apache2-modules, apache2, httpd, httpd-cgi
-Conflicts: apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-event, apache2-common
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
Description: Traditional model for Apache HTTPD 2.1
This Multi-Processing Module (MPM) implements a non-threaded,
pre-forking web server that handles requests in a manner similar to
@@ -54,8 +54,8 @@ Description: Traditional model for Apache HTTPD 2.1
Package: apache2-mpm-event
Architecture: any
Depends: ${shlibs:Depends}, apache2.2-common (= ${Source-Version})
-Provides: apache2-modules, apache2, httpd, httpd-cgi
-Conflicts: apache2-mpm-worker, apache2-mpm-perchild, apache2-common
+Provides: apache2-mpm, apache2, httpd, httpd-cgi
+Conflicts: apache2-mpm, apache2-common
Description: Event driven model for Apache HTTPD 2.1
The event Multi-Processing Module (MPM) is designed to allow more
requests to be served simultaneously by passing off some processing