[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. a796cdbfe9b96b50824a94896ec3bf18ee1a2f20

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 48b3d3fcb6abbacfff51a9f1c344bf587af69737
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Feb 6 21:52:46 2012 +0100

    Remove conflicts with old 1.3 and 2.0 packages

diff --git a/debian/control b/debian/control
index e950ef9..506e63e 100644
--- a/debian/control
+++ b/debian/control
@@ -84,8 +84,6 @@ Description: Transitional package for apache2-bin
 
 Package: apache2-utils
 Architecture: any
-#Replaces: apache2-common, apache-utils (<< 1.3.33-4)
-#Conflicts: apache-common (<< 1.3.28.0.1-1)
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: utility programs for webservers
  Provides some add-on programs useful for any webserver.  These include:
@@ -107,7 +105,7 @@ Package: apache2-suexec-pristine
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 #Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
-#Conflicts: apache2-suexec, apache-common
+#Conflicts: apache2-suexec
 Replaces: apache2-suexec
 Description: Standard suexec program for Apache 2 mod_suexec
  Provides the standard suexec helper program for mod_suexec. This version is 
@@ -120,7 +118,7 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 #Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
 #Provides: apache2-suexec
-#Conflicts: apache2-suexec, apache-common
+#Conflicts: apache2-suexec
 #Replaces: apache2-suexec
 Description: Configurable suexec program for Apache 2 mod_suexec
  Provides a customizable version of the suexec helper program for mod_suexec.

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)