From e6542aca34ca63a2092e4c2778de8cf3d206619d Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 13 Apr 2009 22:56:39 +0200 Subject: [PATCH] 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. --- debian/changelog | 8 ++++---- debian/control | 2 +- debian/rules | 7 ++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a03662..e87e290 100644 --- 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 Mon, 13 Apr 2009 21:45:04 +0200 + -- Sebastian Harl 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 44827ae..c03094b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -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 2934963..39bdd3c 100755 --- 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 -- 2.30.2