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.

diff --git a/debian/changelog b/debian/changelog
index 6a0366257d90a3e33c0d07915f948a3e35e80bcd..e87e290e7484e566eaf4a26b2e36297f9075c68a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,13 +11,13 @@ collectd (4.6.2-1~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.
+  * 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.
   * Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
     libdbi is not available on Etch.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 13 Apr 2009 21:45:04 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 13 Apr 2009 22:51:56 +0200
 
 collectd (4.6.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 44827ae942b1b056b2c7a28b0098a90bc7571408..c03094b62e82e1b91eea69caf041b0d429e7b2e1 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, 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], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], 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-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.8.1
 Homepage: http://collectd.org/

diff --git a/debian/rules b/debian/rules
index 2934963034e3fb90c6975b8da7d9868d574db97e..39bdd3c8bcef943f0e5eaba92c8bcf3a5f327cda 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,14 +61,11 @@ endif
 # libdbi is not available on Etch
 confflags += --disable-dbi
 
-# 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
+# OpenIPMI's .pc files are broken on Etch (see #474087)
+confflags += --disable-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