From f00d8d707305f6390d1b8173d1a165d5c81e4a5c Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 19 Jul 2008 13:49:39 +0200 Subject: [PATCH] Switch back to build-depend on nut-dev. * libupsclient1-dev is not available in Etch. * Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64]. This basically reverts the following commits: * 3dfbceedcd4a15a27d3d39cc30a718613cd7cb6a "Added libupsclient-config.sh to imitate libupsclient-config." * dfcedda29dc7817ce8451e8ecad7cce87d9aa142 "Replaced nut-dev build dependency with libupsclient1-dev." --- debian/bin/libupsclient-config.sh | 6 ------ debian/changelog | 5 ++++- debian/control | 2 +- debian/rules | 12 ++++-------- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100755 debian/bin/libupsclient-config.sh diff --git a/debian/bin/libupsclient-config.sh b/debian/bin/libupsclient-config.sh deleted file mode 100755 index 9d2f50a..0000000 --- a/debian/bin/libupsclient-config.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh -# Simple wrapper around pkg-config imitating libupsclient-config which is no -# longer available. - -/usr/bin/pkg-config $1 libupsclient - diff --git a/debian/changelog b/debian/changelog index 9171ef3..d5d34d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ collectd (4.4.1-2~bpo40+1) etch-backports; urgency=low they are not available in Etch and might confuse buildds. * Removed version from libvirt-dev build-dependency - a version with Xen support is currently not available on backports.org. + * Switch back to build-depend on nut-dev - libupsclient1-dev is not + available in Etch: + - Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64]. - -- Sebastian Harl Sat, 19 Jul 2008 13:34:41 +0200 + -- Sebastian Harl Sat, 19 Jul 2008 13:49:24 +0200 collectd (4.4.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index e2adb00..29d4b85 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-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], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev +Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-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], libsnmp9-dev, libvirt-dev [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 1d87b7c..11f5c05 100755 --- a/debian/rules +++ b/debian/rules @@ -37,17 +37,14 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \ --disable-xmms \ --without-libstatgrab -# libupsclient-config is no longer available - this is a temporary -# workaround until upstream has switched to pkg-config. -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 library netstat cannot be linked into shared objects on some -# architectures (see bugs #358637 and #419684 for more details). +# The static libraries netstat and upsclient 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 + confflags += --disable-netlink --disable-nut endif # libvirt is only available on amd64, i386 and powerpc. @@ -62,7 +59,6 @@ confflags += --enable-ipmi config.status: configure $(DPATCH_STAMPFN) dh_testdir - chmod 755 debian/bin/libupsclient-config.sh BUILD_WITH_OPENIPMI_LIBS="$(BUILD_WITH_OPENIPMI_LIBS)" \ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags) -- 2.30.2