From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 28 Jan 2010 21:01:21 +0000 (+0100)
Subject: rules: Re-enabled non-kfreebsd plugins on i386 and amd64.
X-Git-Tag: collectd-4.9.1-2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9f355605cb538406466aaad80341b3db6372dac3;p=pkg-collectd.git

rules: Re-enabled non-kfreebsd plugins on i386 and amd64.

They had been disabled accidentally by using findstring (which does a
substring match) to compare DEB_BUILD_ARCH with kfreebsd-{amd64,i386}.

Thanks to ilia kudirov for reporting this!

Closes: #567259
---

diff --git a/debian/changelog b/debian/changelog
index 4eb825e..d04fe34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+collectd (4.9.1-2) unstable; urgency=low
+
+  * debian/rules:
+    - Re-enabled non-kfreebsd plugins on i386 and amd64, which had been
+      disabled accidentally by using findstring (which does a substring match)
+      to compare DEB_BUILD_ARCH with kfreebsd-{amd64,i386}; thanks to ilia
+      kudirov for reporting this (Closes: #567259).
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 28 Jan 2010 21:58:35 +0100
+
 collectd (4.9.1-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/rules b/debian/rules
index 3525158..9ffcc68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
 endif
 
 # These plugins are Linux-specific.
-ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
+ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
 		--disable-iptables \
 		--disable-ipvs \
@@ -97,7 +97,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
 endif
 
 # These plugins have not been ported to FreeBSD yet.
-ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
+ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
 		--disable-battery \
 		--disable-conntrack \
@@ -116,7 +116,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
 endif
 
 # Build-dependencies of these plugins are (not yet) available for kfreebsd.
-ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
+ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
 		--disable-gmond \
 		--disable-libvirt \