[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.5-4-3-g5a72640

[Dominic Hargreaves]

The following commit has been merged in the master branch:
commit 5a72640fa415bcf62178f56f3a1496940cf82678
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Dec 18 17:27:47 2011 +0000

    Add Build-Conflicts on apache2-mpm-event (marked as experimental) since it causes this package to FTBFS (Closes: #652331)

diff --git a/debian/changelog b/debian/changelog
index ef44093..70e93c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 libapache2-mod-perl2 (2.0.5-5) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Remove build dependency on libcompress-zlib-perl, Compress::Zlib is in
     perl core since 5.9.3.
 
+  [ Dominic Hargreaves ]
+  * Add Build-Conflicts on apache2-mpm-event (marked as experimental)
+    since it causes this package to FTBFS (Closes: #652331)
+
  -- gregor herrmann <gregoa at debian.org>  Sun, 04 Dec 2011 15:27:34 +0100
 
 libapache2-mod-perl2 (2.0.5-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0d593ef..725123b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: perl,
  locales-all,
  netbase,
  perl (>= 5.10.1) | libautodie-perl
+Build-Conflicts: apache2-mpm-event
 
 Package: libapache2-mod-perl2
 Architecture: any

-- 
Debian packaging of libapache2-mod-perl2