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

… and removed build-dependency on libmemcached-dev, which is not available on
Etch.

diff --git a/debian/changelog b/debian/changelog
index c2f761ce94534a5ecd17ae76f1e2ea6710f91bb1..af5ba9e7640605a4538cb356e78f40e54e674c6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@ collectd (4.8.2-1~bpo40+1) etch-backports; urgency=low
   * debian/rules, debian/control, debian/collectd.conf:
     - Disabled gmond plugin and removed build-dependency on libganglia1-dev -
       versions >= 3 are not available on Etch.
+    - Disabled memcachec plugin and removed build-dependency on
+      libmemcached-dev, which is not available on Etch.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:31:25 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:36:30 +0100
 
 collectd (4.8.2-1) unstable; urgency=medium
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 8ef39ee82a8e83108ae34a08f32f0dc1042a49c0..a3b7dd24a198c56b365245b9665ee583dbd09b6f 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -57,7 +57,6 @@ LoadPlugin irq
 LoadPlugin load
 #LoadPlugin madwifi
 #LoadPlugin mbmon
-#LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin multimeter
@@ -313,19 +312,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 a497c608483f43b01dee6c105f0e9bc91efa13ff..bacfbfd59fcdb1d862c498d650cd09cb36b3686d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 5), po-debconf, dpatch,
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
- libmemcached-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -43,7 +42,7 @@ Suggests: collectd-dev,
  libconfig-general-perl, httpd-cgi,
 # services providing data that may be collected by collectd
  apache2, apcupsd, bind9, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
- memcached, mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
+ mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
  pdns-server, postgresql, time-daemon,
  ${shlibs:Suggests}
 Replaces: collectd (<< 4.8.2-1~)
@@ -97,7 +96,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 7e78cdd6bdb773a0514578bb3a0a75d884eb5b74..fac70d12900bfe1009d6a726a8535f2247c3db79 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,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
+
 # libowcapi is required for the onewire plugin.
 confflags += --disable-onewire