From 2f25bed4ee904508fc540c32d495c44cb79d1429 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 18 Dec 2008 11:13:13 +0100 Subject: [PATCH] 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. --- debian/changelog | 5 ++++- debian/control | 2 +- debian/rules | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcd56dc..af07aea 100644 --- 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 Thu, 18 Dec 2008 10:24:53 +0100 + -- Sebastian Harl 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 19571ae..189224c 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 (>= 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 e07904f..a3a41b3 100755 --- 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 -- 2.30.2