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

… and removed build-dependency on libganglia1-dev - versions >= 3 are not
available on Etch.

diff --git a/debian/changelog b/debian/changelog
index 2cc0a084112fe0be32a078cfbb1728b4ad8cefff..c2f761ce94534a5ecd17ae76f1e2ea6710f91bb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ collectd (4.8.2-1~bpo40+1) etch-backports; urgency=low
   * debian/control, debian/rules:
     - Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
       libdbi is not available on Etch.
+  * debian/rules, debian/control, debian/collectd.conf:
+    - Disabled gmond plugin and removed build-dependency on libganglia1-dev -
+      versions >= 3 are not available on Etch.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:28:29 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 11 Jan 2010 18:31:25 +0100
 
 collectd (4.8.2-1) unstable; urgency=medium
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 8ee6f11b5eec595b2114377f1b825575fffdf0b8..8ef39ee82a8e83108ae34a08f32f0dc1042a49c0 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -46,7 +46,6 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
@@ -247,22 +246,6 @@ LoadPlugin users
 #      </Directory>
 #</Plugin>
 
-#<Plugin gmond>
-#      MCReceiveFrom "239.2.11.71" "8649"
-#
-#      <Metric "swap_total">
-#              Type "swap"
-#              TypeInstance "total"
-#              DataSource "value"
-#      </Metric>
-#
-#      <Metric "swap_free">
-#              Type "swap"
-#              TypeInstance "free"
-#              DataSource "value"
-#      </Metric>
-#</Plugin>
-
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634

diff --git a/debian/control b/debian/control
index 0a9e7a5d67b5a9ec99aa00b251180ea6cb3921eb..a497c608483f43b01dee6c105f0e9bc91efa13ff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 5), po-debconf, dpatch,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
  libcurl3-gnutls-dev,
  libesmtp-dev,
- libganglia1-dev (>= 3),
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
@@ -86,7 +85,6 @@ Description: statistics collection and monitoring daemon (core system)
    * count the number of files in directories: filecount
    * Linux file-system based caching framework statistics: fscache
    * query data from Java processes using JMX: GenericJMX (Java based plugin)
-   * Receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPMI sensors information: ipmi

diff --git a/debian/rules b/debian/rules
index 553fea130d1d690101e6edea2de9fceda93bfeb7..7e78cdd6bdb773a0514578bb3a0a75d884eb5b74 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,9 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libganglia >= 3 is required for the gmond plugin.
+confflags += --disable-gmond
+
 # libowcapi is required for the onewire plugin.
 confflags += --disable-onewire