From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 11 Aug 2008 14:52:46 +0000 (+0200)
Subject: Removed the work around for #474087 (broken openipmi .pc files).
X-Git-Tag: collectd-4.4.2-2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53d6dd07c4823ebec0fc0fbb5b8e8a8691c1c6c6;p=pkg-collectd.git

Removed the work around for #474087 (broken openipmi .pc files).

Instead build depend on libopenipmi-dev (>= 2.0.14-1~) which includes fixed
.pc files. This fixes an undefined symbol error when loading the ipmi plugin
caused by that work around.

Closes: #494665
---

diff --git a/debian/changelog b/debian/changelog
index 403d2db..207abd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+collectd (4.4.2-2) unstable; urgency=low
+
+  * Removed the work around for #474087 (broken openipmi .pc files) introduced
+    in 4.4.1-1 and instead build depend on libopenipmi-dev (>= 2.0.14-1~)
+    which includes fixed .pc files. This fixes an undefined symbol error when
+    loading the ipmi plugin caused by that work around (Closes: #494665).
+
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 11 Aug 2008 16:45:22 +0200
+
 collectd (4.4.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index bbb843c..a7c2894 100644
--- 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), 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, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-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, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~)
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.0
 Homepage: http://collectd.org/
diff --git a/debian/rules b/debian/rules
index 48ba075..9eff781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,14 +51,8 @@ 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
-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