collectd.conf, control, rules: Disabled the "tokyotyrant" plugin.

This plugin requires libtokyotyrant which is not available in Lenny; removed
libtokyocabinet-dev and libtokyotyrant-dev build-dependencies.

diff --git a/debian/changelog b/debian/changelog
index a05f59f79e799dcf74bb3089d1c04cc209332957..ba252b10dbcc098da1e8d3391c591fed767ca9fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,11 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
       not available in Lenny; removed build-dependency on libmemcached-dev.
     - Disabled the "rrdcached" plugin, which requires rrdclient support in
       librrd; removed version from librrd-dev build-dependency.
+    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
+      is not available in Lenny; removed libtokyocabinet-dev and
+      libtokyotyrant-dev build-dependencies.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:23:02 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:27:10 +0100
 
 collectd (4.9.1-2) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index c122ec7f059a531b50fcdb88e4c87a168e020dfd..79e2e69fe07c6d6df330a31ac5b3d939bd1c6a32 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -91,7 +91,6 @@ LoadPlugin swap
 #LoadPlugin teamspeak2
 #LoadPlugin ted
 #LoadPlugin thermal
-#LoadPlugin tokyotyrant
 #LoadPlugin unixsock
 #LoadPlugin uptime
 LoadPlugin users
@@ -691,11 +690,6 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
-#<Plugin tokyotyrant>
-#      Host "localhost"
-#      Port "1978"
-#</Plugin>
-
 #<Plugin unixsock>
 #      SocketFile "/var/run/collectd-unixsock"
 #      SocketGroup "collectd"

diff --git a/debian/control b/debian/control
index 64ac91b3c8ed7cf070e218b09310bd54584103ad..07c0c25cf9bc8ccc1f59ee12d36f2eb302c22b4e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
 # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
- libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64],
- libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libupsclient1-dev,
  libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64],
  libxml2-dev,

diff --git a/debian/rules b/debian/rules
index 294712a19b4c3dc51a8480b3f5a5100dccf1e7fe..e9e39db07060d1da9292a60e525922f96cccfd9e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,9 @@ confflags += --disable-routeros
 # 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