Removed libupsclient-config.sh.

Upstream now supports pkg-config for libupsclient.

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 4f1f98a6e8fd8f9de958a25b5ee2e37ecc4cd01f..f6243d8de59cc769494d8a09ef6fc47d2fe0c4e6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ collectd (4.4.2-1) unstable; urgency=low
   * Removed librrd0-dev and libmysqlclient14-dev from the build-dependencies -
     those package are no longer available since Etch.
   * Removed byacc from the build-dependencies - collectd now requires bison.
+  * Removed libupsclient-config.sh - upstream now supports pkg-config for
+    libupsclient.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 13:26:19 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 13:28:33 +0200
 
 collectd (4.4.1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 1d87b7c4b14c90597ecad26479c82615261ef73b..86ac6c55fb7153081e86ee2d0293d6f84e21f683 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,6 @@ 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
 
@@ -62,7 +58,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)