From c861779c9f26bf4536e041a3e1e553b584c748c8 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 22 Mar 2010 23:28:25 +0100 Subject: [PATCH] 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. --- debian/changelog | 5 ++++- debian/collectd.conf | 6 ------ debian/control | 2 -- debian/rules | 3 +++ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index a05f59f..ba252b1 100644 --- 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 Mon, 22 Mar 2010 23:23:02 +0100 + -- Sebastian Harl 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 c122ec7..79e2e69 100644 --- 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 # -# -# Host "localhost" -# Port "1978" -# - # # SocketFile "/var/run/collectd-unixsock" # SocketGroup "collectd" diff --git a/debian/control b/debian/control index 64ac91b..07c0c25 100644 --- 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 294712a..e9e39db 100755 --- 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 -- 2.30.2