From dfcedda29dc7817ce8451e8ecad7cce87d9aa142 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 7 Jul 2008 20:39:28 +0000 Subject: [PATCH] Replaced nut-dev build dependency with libupsclient1-dev. Reenabled the "nut" plugin on all architectures. --- debian/changelog | 4 +++- debian/control | 2 +- debian/rules | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8438e60..97168ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,10 @@ collectd (4.4.1-2) UNRELEASED; urgency=low longer available. libupsclient-config.sh is a simple wrapper around pkg-config. This is a workaround until upstream supports pkg-config for libupsclient. + * Replaced nut-dev build dependency with libupsclient1-dev: + Reenabled the "nut" plugin on all architectures. - -- Sebastian Harl Mon, 07 Jul 2008 20:24:57 +0000 + -- Sebastian Harl Mon, 07 Jul 2008 20:36:55 +0000 collectd (4.4.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 18d7976..ea5738e 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, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | 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], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, 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, libopenipmi-dev Build-Conflicts: libpthread-dev Standards-Version: 3.8.0 Homepage: http://collectd.org/ diff --git a/debian/rules b/debian/rules index 32f5d3a..1d87b7c 100755 --- a/debian/rules +++ b/debian/rules @@ -44,11 +44,10 @@ confflags += --with-libupsclient=$(CURDIR)/debian/bin/libupsclient-config.sh # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape -# The static libraries netstat and upsclient cannot be linked into shared -# objects on some architectures (see bugs #358637 and #419684 for more -# details). +# The static library netstat cannot be linked into shared objects on some +# architectures (see bugs #358637 and #419684 for more details). ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64)) - confflags += --disable-netlink --disable-nut + confflags += --disable-netlink endif # libvirt is only available on amd64, i386 and powerpc. -- 2.30.2