From a183e0be1314180dc618c0ec9990767f46f02014 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 29 Mar 2008 12:25:13 +0100 Subject: [PATCH] Disabled iptables plugin - libiptc is no longer available on Debian. Also limited iproute-dev build dependency to [!alpha !amd64 !hppa !ia64 !ppc64]. --- debian/changelog | 3 ++- debian/control | 2 +- debian/rules | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d53e9ca..54f9ed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ collectd (4.3.2-1) unstable; urgency=low - pt.po, thanks to Américo Monteiro (Closes: #469745, #472183). * collectd.init.d: Consider the DISABLE option only when starting collectd. * Added libsensors4-dev as option to the libsensors-dev build dependency. + * Disabled iptables plugin - libiptc is no longer available on Debian. - -- Sebastian Harl Sat, 29 Mar 2008 12:15:27 +0100 + -- Sebastian Harl Sat, 29 Mar 2008 12:23:12 +0100 collectd (4.3.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 614ddd4..da0937f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors4-dev | libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev, libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors4-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], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev Build-Conflicts: libpthread-dev Standards-Version: 3.7.3 Homepage: http://collectd.org/ diff --git a/debian/rules b/debian/rules index 83334b6..9953252 100755 --- a/debian/rules +++ b/debian/rules @@ -36,13 +36,16 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \ --disable-xmms \ --without-libstatgrab +# libiptc is no longer available on Debian (see #472655). +confflags += --disable-iptables + # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape # The static libraries iptc, netstat and upsclient cannot be used on # 64bit systems (see bugs #358637 and #419684 for more details). ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64)) - confflags += --disable-iptables --disable-netlink --disable-nut + confflags += --disable-netlink --disable-nut endif # libvirt is only available on amd64, i386 and powerpc. -- 2.30.2