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 4eb825efcb5da43778397ea2dd64adc478f5b759..d04fe34fab64215f5ceed9d665c2e622933eb5de 100644 (file)
--- 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 35251583f3864f619af888b07d0a16f6aeb7386e..9ffcc689d1c78c3da9166bb7d81da058f10ec91b 100755 (executable)
--- 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 \