[pkg-lighttpd] r329 - lighttpd/trunk/debian

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-05-06 17:59:43 +0000 (Tue, 06 May 2008)
New Revision: 329

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/control
Log:
Missing conflicts.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-05-06 17:58:17 UTC (rev 328)
+++ lighttpd/trunk/debian/changelog	2008-05-06 17:59:43 UTC (rev 329)
@@ -10,6 +10,7 @@
     + install spawn-fcgi as spawn-fcgi.lighttpd.
     + install master alternatives on spawn-fcgi.lighttpd and
       spawn-fcgi.lighttd.1.
+    + add Conflict against cherokee <= 0.6.1-1.
 
  -- Pierre Habouzit <madcoder at debian.org>  Sun, 13 Apr 2008 13:27:55 +0200
 

Modified: lighttpd/trunk/debian/control
===================================================================
--- lighttpd/trunk/debian/control	2008-05-06 17:58:17 UTC (rev 328)
+++ lighttpd/trunk/debian/control	2008-05-06 17:59:43 UTC (rev 329)
@@ -20,6 +20,7 @@
 Depends: ${shlibs:Depends}, lsb-base (>= 3.0-3), mime-support, libterm-readline-perl-perl
 Provides: httpd, httpd-cgi
 Suggests: openssl, rrdtool, apache2-utils
+Conflicts: cherokee (<= 0.6.1-1)
 Description:  A fast webserver with minimal memory footprint
  lighttpd is a small webserver and fast webserver developed with
  security in mind and a lot of features.