control, rules: Added a (new) work around for #474087.

This works around the broken openipmi .pc files shipped with Etch by providing
a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adding that path
to PKG_CONFIG_PATH. Removed the version from the libopenipmi-dev build
dependency - Etch does not include a fixed version of openipmi.

Obviously, no longer disable the ipmi plugin.

diff --git a/debian/changelog b/debian/changelog
index 564f3db7c0c2cc9441134ed34fc7e07708766df6..cfa635eac2bac7ebe70166481777185123b95322 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,13 +13,15 @@ collectd (4.6.3-1~bpo40+1) etch-backports; urgency=low
     - Build-conflict with iptables-dev to force the use of the shipped libiptc
       (this allows building the iptables plugin on all architectures).
   * debian/control, debian/rules:
-    - Disabled the "openipmi" plugin - the work around for #474087 (broken
-      openipmi .pc files) no longer works because of the strict dependency
-      checking introduced in 4.5.1. Removed libopenipmi-dev build-dependency.
+    - Added a work around for #474087 (broken openipmi .pc files) by providing
+      a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adding
+      that path to PKG_CONFIG_PATH. Removed the version from the
+      libopenipmi-dev build dependency - Etch does not include a fixed version
+      of openipmi.
     - Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
       libdbi is not available on Etch.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 13:00:37 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 13:52:04 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b1b6d8f7dcbd5d9c167c609a9127737a44725c83..2b042a9f0aece91001670b01767624c6ff3686b0 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -45,6 +45,7 @@ LoadPlugin entropy
 #LoadPlugin filecount
 #LoadPlugin hddtemp
 LoadPlugin interface
+#LoadPlugin ipmi
 #LoadPlugin iptables
 #LoadPlugin ipvs
 LoadPlugin irq

diff --git a/debian/control b/debian/control
index 9902ef72cd59214a7a157f54bec7c5266d678d21..c91ad8aedc6893b5033d0e9ba13aca45ca8eefd5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
+Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
 Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.8.1
 Homepage: http://collectd.org/
@@ -53,6 +53,7 @@ Description: statistics collection and monitoring daemon
    * count the number of files in directories: filecount
    * harddisk temperature: hddtemp
    * network traffic: interface
+   * IPMI sensors information: ipmi
    * iptables statistics: iptables
    * IPVS connection statistics: ipvs
    * IRQ counters: irq

diff --git a/debian/rules b/debian/rules
index 8f251118b8bd49801b1842f19dc27072f31cffae..b0ca029add6a3c2bc09474e8b2458d8d7d3aa70f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,11 +61,16 @@ endif
 # libdbi is not available on Etch
 confflags += --disable-dbi
 
-# OpenIPMI's .pc files are broken on Etch (see #474087)
-confflags += --disable-ipmi
-
 config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
+       
+       # This is a work-around for #474087 (broken openipmi .pc files).
+       mkdir debian/pkgconfig
+       sed -re 's/^(Requires:.*) pthread(.*)$$/\1\2/' \
+               /usr/lib/pkgconfig/OpenIPMIpthread.pc \
+               > debian/pkgconfig/OpenIPMIpthread.pc
+       
+       PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
        CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
 build: build-stamp
@@ -88,6 +93,8 @@ clean: unpatch
        rm -f debian/README.Debian.plugins
        rm -f src/*.1 src/*.5
        
+       rm -rf debian/pkgconfig
+       
        dh_clean
        debconf-updatepo