Reenabled and fixed the work around for #474087.

Removed the version from the libopenipmi-dev build dependency - Etch does not
include a fixed version of openipmi.

diff --git a/debian/changelog b/debian/changelog
index bcd56dcc89d5cc69e34c6a9347bcb087a49f0c40..af07aeae503195db93c78c0056f4dc732a98b075 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ collectd (4.4.2-3~bpo40+1) etch-backports; urgency=low
   * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
   * Build-conflict with iptables-dev to force the use of the shipped libiptc
     (this allows building the iptables plugin on all architectures).
+  * Reenabled and fixed the work around for #474087 (broken openipmi .pc
+    files) and removed the version from the libopenipmi-dev build dependency -
+    Etch does not include a fixed version of openipmi.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Dec 2008 10:24:53 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Dec 2008 11:10:56 +0100
 
 collectd (4.4.2-3) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 19571aeaa3c5415a59fc41dd90d5438e93ed77d8..189224c1554f7c66907e79d36eef4348fc647935 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, 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], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~)
+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], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
 Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.8.0
 Homepage: http://collectd.org/

diff --git a/debian/rules b/debian/rules
index e07904f417f15091f988c7763411579a0a1aafb5..a3a41b340ff346c63d616560292011d7cdd5613d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,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