From 98750ff433ea10b39997e8c9d63e978cb9a08e8a Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 20 Aug 2008 10:53:12 +0200 Subject: [PATCH] Build-conflict with iptables-dev to force the use of the shipped libiptc. Else, the iptables plugin cannot be build on some architectures. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a62e63..78b11fc 100644 --- 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 Thu, 14 Aug 2008 17:08:06 +0200 + -- Sebastian Harl 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 1fefeeb..3d68821 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Sebastian Harl 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 -- 2.30.2