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."

diff --git a/debian/bin/libupsclient-config.sh b/debian/bin/libupsclient-config.sh
deleted file mode 100755 (executable)
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 9171ef34ba3697ee130bedbb43364c7e6e166835..d5d34d8aa89b1b9d2c4c30ab76e27381dbaa3515 100644 (file)
--- 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 <sh@tokkee.org>  Sat, 19 Jul 2008 13:34:41 +0200
+ -- Sebastian Harl <sh@tokkee.org>  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 e2adb00dd08653969e1cf813b767b16a7f8b3bc4..29d4b85a51314ef49db400667b3bcfc5dbe748cd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 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-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 1d87b7c4b14c90597ecad26479c82615261ef73b..11f5c05efeb0e3a7ebed41eb1891a0c000c12c76 100755 (executable)
--- 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)