From 6a818f6f3ab461aa68d1d7843c973b149341b081 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 29 Aug 2009 12:27:19 +0200 Subject: [PATCH] control, rules: Reintroduced a work around for #474087. Again, the openipmi .pc files are broken in the latest version of openipmi. The work around provides a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adds that path to PKG_CONFIG_PATH. Removed the version from the libopenipmi-dev build dependency for now. --- debian/changelog | 6 +++++- debian/control | 2 +- debian/rules | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d03ee2b..ff295aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,10 @@ collectd (4.7.2-1) unstable; urgency=low * debian/control, debian/rules: - No not limit the libvirt plugin to amd64, i386, powerpc - libvirt-dev seems to be available on all architectures now. + - Reintroduced 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 for now. * debian/collectd.conf: - Set the 'apache' plugin's URL according to the default used by Debian's Apache; thanks to Joey Hess for reporting this (Closes: #541888). @@ -74,7 +78,7 @@ collectd (4.7.2-1) unstable; urgency=low release goal to remove those files (for details see ). - -- Sebastian Harl Sat, 29 Aug 2009 09:42:52 +0200 + -- Sebastian Harl Sat, 29 Aug 2009 12:25:40 +0200 collectd (4.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2699502..f210583 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6), libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk, libganglia1-dev (>= 3), libgcrypt11-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6), libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk, libganglia1-dev (>= 3), libgcrypt11-dev Build-Conflicts: libpthread-dev Standards-Version: 3.8.3 Homepage: http://collectd.org/ diff --git a/debian/rules b/debian/rules index f7e3c01..4e0454d 100755 --- a/debian/rules +++ b/debian/rules @@ -78,6 +78,14 @@ endif 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" \ ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \ JAVAC="$(JAVAC)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \ JAVA_LDFLAGS="$(JAVA_LDFLAGS)" @@ -102,6 +110,8 @@ clean: unpatch rm -f debian/README.Debian.plugins rm -f src/*.1 src/*.5 + rm -rf debian/pkgconfig + dh_clean debconf-updatepo -- 2.30.2