[Pkg-apache-commits] r1192 - in /trunk/apache2: changelog control

[sf at alioth.debian.org]

Author: sf
Date: Sun Apr 25 08:14:48 2010
New Revision: 1192

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1192
Log:
* Conflict with apache package as we now include apachectl. Closes: #579065
* Remove conflicts with old apache 2.0 modules. The conflicts are not
  necessary anymore as skipping a stable release is not supported anyway.

Modified:
    trunk/apache2/changelog
    trunk/apache2/control

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1192&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Apr 25 08:14:48 2010
@@ -1,5 +1,8 @@
 apache2 (2.2.15-5) UNRELEASED; urgency=low
 
+  * Conflict with apache package as we now include apachectl. Closes: #579065
+  * Remove conflicts with old apache 2.0 modules. The conflicts are not
+    necessary anymore as skipping a stable release is not supported anyway.
   * Silence the grep in preinst.
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 25 Apr 2010 10:01:03 +0200

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1192&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Sun Apr 25 08:14:48 2010
@@ -15,7 +15,7 @@
 Depends: ${misc:Depends}, apache2.2-bin (= ${binary:Version}), apache2-utils, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
 Recommends: ssl-cert
 Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom
-Conflicts: apache2-common, libapache2-mod-php5 (<= 5.1.6-3), libapache2-mod-php4 (<= 4:4.4.4-2), libapache2-mod-mime-xattr (<= 0.3-2), libapache2-mod-mono (<= 1.1.17-3), libapache2-mod-proxy-html (<= 2.4.3-2), libapache2-mod-scgi (<= 1.11-1), libapache2-mod-speedycgi (<= 2.22-3), libapache2-modxslt (<= 2005072700-1), libapache2-redirtoservername (<= 0.1-1), libapache2-webauth (<= 3.5.3-1), libapache2-webkdc (<= 3.5.3-1)
+Conflicts: apache2-common, apache
 Replaces: apache2-common
 Description: Apache HTTP Server common files
  The Apache Software Foundation's goal is to build a secure, efficient and