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

This plugin requires libmemcached which is not available in Lenny; removed
build-dependency on libmemcached-dev.

diff --git a/debian/changelog b/debian/changelog
index 1a7da9f93de28342e23e1591474aee8762a86589..ba96b19aacbf49b6bdeaf81832d3a51161e9a4b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
   * debian/collectd.conf, debian/control, debian/rules:
     - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
       not available in Lenny; removed build-dependency on libganglia-dev.
+    - Disabled the "memcachec" plugin, which requires libmemcached which is
+      not available in Lenny; removed build-dependency on libmemcached-dev.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:14:11 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:17:31 +0100
 
 collectd (4.9.1-2) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index a3ed21598e12f0fd8c2b5b13675842a49568486b..2cf0fff1316e78406db952fdc8e35562fe32c4bb 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -59,7 +59,6 @@ LoadPlugin irq
 LoadPlugin load
 #LoadPlugin madwifi
 #LoadPlugin mbmon
-#LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin multimeter
@@ -347,19 +346,6 @@ LoadPlugin users
 #      Port 411
 #</Plugin>
 
-#<Plugin memcachec>
-#      <Page "plugin_instance">
-#              Server "localhost"
-#              Key "page_key"
-#              <Match>
-#                      Regex "(\\d+) bytes sent"
-#                      DSType CounterAdd
-#                      Type "ipt_octets"
-#                      Instance "type_instance"
-#              </Match>
-#      </Page>
-#</Plugin>
-
 #<Plugin memcached>
 #      Socket "/var/run/memcached.sock"
 # or:

diff --git a/debian/control b/debian/control
index 331091203b7876f01024046c906826edfbc7e9f5..15fea539b5b7f1bc45b5be1e74dd6525a82a7118 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
- libmemcached-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -104,7 +103,6 @@ Description: statistics collection and monitoring daemon (core system)
    * logging to files, STDOUT and STDERR: logfile
    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
-   * Query and parse data from a memcache daemon: memcachec
    * statistics of the memcached distributed caching system: memcached
    * memory usage: memory
    * multimeter statistics: multimeter

diff --git a/debian/rules b/debian/rules
index 2c484b3b06d2c0eacad36e1035803aa0850787a9..acf63fb6d88edd6fa79678073fc5104e14911a8d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,9 @@ confflags += --disable-apple_sensors --disable-tape
 # libganglia >= 3 is required for the gmond plugin.
 confflags += --disable-gmond
 
+# libmemcached is required for the memcachec plugin.
+confflags += --disable-memcachec
+
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp