Added a work around for #474087 (broken openipmi .pc files).

 * Force the inclusion of the ipmi plugin.
 * Manually specify the dependencies.

diff --git a/debian/changelog b/debian/changelog
index b08e159aa20f855dddb3e325d027af7b7b3d4e56..e3dbc3099e3e96fd7b8a67d51bd344998c2c5a4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ collectd (4.4.0-1) unstable; urgency=low
     - Added /usr/share/doc/collectd/examples/iptables/.
   * New debconf template translations:
     - gl.po, thanks to Jacobo Tarrio (Closes: #482667).
+  * Added a work around for #474087 (broken openipmi .pc files) by forcing the
+    inclusion of the ipmi plugin and manually specifying the dependencies.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 26 May 2008 18:17:39 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Tue, 27 May 2008 08:36:05 +0200
 
 collectd (4.3.2-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 36abe9c72d827e38cfd568196e88cc0e1d69ec3d..23b80f1e533b80acaf0423658566c35ae461d561 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,14 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386 powerpc))
        confflags += --disable-libvirt
 endif
 
+# Force the inclusion of the ipmi plugin and manually specify its
+# dependencies to work around #474087 (broken openipmi .pc files).
+BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI
+confflags += --enable-ipmi
+
 config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
+       BUILD_WITH_OPENIPMI_LIBS="$(BUILD_WITH_OPENIPMI_LIBS)" \
        CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
 build: build-stamp