Build-conflict with iptables-dev to force the use of the shipped libiptc.

Else, the iptables plugin cannot be build on some architectures.

diff --git a/debian/changelog b/debian/changelog
index 0a62e63a2b59bb501119cd5095087763637fc8a4..78b11fc74ea3f45641b32d56530a122204d01f5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ collectd (4.4.1-2~bpo40+1) etch-backports; urgency=low
   * No longer remove version from libvirt-dev build-dependency - a version
     with Xen support is now available on backports.org.
   * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+  * Build-conflict with iptables-dev to force the use of the shipped libiptc.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 14 Aug 2008 17:08:06 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 20 Aug 2008 10:52:14 +0200
 
 collectd (4.4.1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1fefeeb5811c6a1c8ad4263d7faade9382164eed..3d68821bbddd34ae66f9a9e4e21dc7b6bd309184 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
 Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
-Build-Conflicts: libpthread-dev
+Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.8.0
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git