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

[sf at alioth.debian.org]

Author: sf
Date: Sat Sep  5 06:51:43 2009
New Revision: 1041

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1041
Log:
Add Build-Conflicts: autoconf2.13

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

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1041&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Sep  5 06:51:43 2009
@@ -1,3 +1,9 @@
+apache2 (2.2.13-2) UNRELEASED; urgency=low
+
+  * Add Build-Conflicts: autoconf2.13 (closes: #541536).
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 05 Sep 2009 08:50:51 +0200
+
 apache2 (2.2.13-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1041&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Sat Sep  5 06:51:43 2009
@@ -4,6 +4,7 @@
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen at debian.org>, Thom May <thom at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Samuelson <peter at p12n.org>, Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>
 Build-Depends: debhelper (>= 7), dpatch, lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev, sharutils, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], autoconf
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2
 Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apache2