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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 57444869f3ca5c6850a39609f8251b3f900baec6
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:24:33 2012 +0100

    autotools2.13 ist still there, keep conflict

diff --git a/debian/control b/debian/control
index 201ec17..6f80f6d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.1.0~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.4.0), libapr1-dev, libpcre3-dev, zlib1g-dev,
  libssl-dev (>= 0.9.8m), libcap-dev [linux-any],
  liblua5.1-0-dev, libxml2-dev, autotools-dev
-#Build-Conflicts: autoconf2.13
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.2
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
 Vcs-Git: git://git.debian.org/git/pkg-apache/apache2.git

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