rules: Disabled the tokyotyrant and zfs_arc plugins.

Their dependencies are not available.

diff --git a/debian/changelog b/debian/changelog
index a9ef0f7f6e8b8ffea5dc7e3fc15f2c12663eabcb..a3e754da6a972d3a725e16dae5299bdd2bdc96b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ collectd (4.8.1-1) unstable; urgency=medium
   * Set urgency to medium because of the fix for #535786.
   * debian/rules:
     - Install contrib/GenericJMX.conf to /usr/share/doc/collectd/examples/.
+    - Disabled the tokyotyrant and zfs_arc plugins - their dependencies are
+      not available.
   * debian/patches:
     - Removed bts535787-powerdns-fix-localsocket.dpatch - included upstream.
     - Removed bts541953-curl-followlocation.dpatch - included upstream.
@@ -34,7 +36,7 @@ collectd (4.8.1-1) unstable; urgency=medium
   * debian/control:
     - Build depend on libyajl-dev, which is required by the curl_json plugin.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 15 Oct 2009 19:25:02 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 15 Oct 2009 19:27:09 +0200
 
 collectd (4.7.2-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 3e40466d2d9a5277cb9c8b87f83a8f3cf5d75768..afddc8c2d8462e1f0b29d98880c2039802ff6a90 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -67,9 +67,15 @@ confflags += --disable-oracle
 # rrdclient support in librrd is required for the rrdcached plugin.
 confflags += --disable-rrdcached
 
+# libtokyotyrant is required for the tokyotyrant plugin.
+confflags += --disable-tokyotyrant
+
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms
 
+# libkstat is required for the xfs_arc plugin.
+confflags += --disable-zfs-arc
+
 # The static library netstat cannot be linked into shared objects on some
 # architectures (see bugs #358637, #419684 and #524593 for more details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))