Added libupsclient-config.sh to imitate libupsclient-config.

libupsclient-config is no longer available. libupsclient-config.sh is a
simple wrapper around pkg-config. This is a workaround until upstream
supports pkg-config for libupsclient.

diff --git a/debian/bin/libupsclient-config.sh b/debian/bin/libupsclient-config.sh
new file mode 100755 (executable)
index 0000000..9d2f50a
--- /dev/null
+++ b/debian/bin/libupsclient-config.sh
@@ -0,0 +1,6 @@
+#! /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 d2336986028849f533e695a7c6f82469b6a451a4..8438e6058ac4c257138baebbeb05a3b013673703 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ collectd (4.4.1-2) UNRELEASED; urgency=low
     #479899.
   * Added build dependency on pkg-config - this is used by collectd's
     configure script to check for a couple of libraries.
+  * Added libupsclient-config.sh to imitate libupsclient-config which is no
+    longer available. libupsclient-config.sh is a simple wrapper around
+    pkg-config. This is a workaround until upstream supports pkg-config for
+    libupsclient.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 07 Jul 2008 19:31:19 +0000
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 07 Jul 2008 20:24:57 +0000
 
 collectd (4.4.1-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 11f5c05efeb0e3a7ebed41eb1891a0c000c12c76..32f5d3a65330cbfb600ad58aa9ad60bb65e411b0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,10 @@ 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
 
@@ -59,6 +63,7 @@ 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)