From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 2 Apr 2016 08:41:42 +0000 (+0200)
Subject: Disable the gmond plugin for now.
X-Git-Tag: collectd-5.5.1-2~1
X-Git-Url: https://git.tokkee.org/?p=pkg-collectd.git;a=commitdiff_plain;h=588329818897bf4042ae552e1784c2712066b53c

Disable the gmond plugin for now.

Ganglia is not available in testing (cf. #812462) and the package hasn't been
touched in 18 months.

Thanks to Santiago Vila for reporting this!
Closes: #819241
---

diff --git a/debian/changelog b/debian/changelog
index d9edf57..e9dacee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+collectd (5.5.1-2) unstable; urgency=medium
+
+  * Disable the gmond plugin for now. Ganglia is not available in testing
+    (cf. #812462). Thanks to Santiago Vila for reporting this
+    (Closes: #819241).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 02 Apr 2016 10:41:27 +0200
+
 collectd (5.5.1-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/collectd.conf b/debian/collectd.conf
index cea1e59..da1c79b 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -115,7 +115,6 @@ LoadPlugin entropy
 #LoadPlugin fhcount
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipc
@@ -520,22 +519,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 f6982bd..9a717ba 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,
- libganglia1-dev (>= 3) [linux-any],
  libgcrypt11-dev,
  libglib2.0-dev,
  libhiredis-dev,
@@ -120,7 +119,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
    * IPC statistics: ipc
diff --git a/debian/rules b/debian/rules
index b25ae8e..db3b61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,10 @@ confflags += --disable-tape
 # libaquaero5 is required for the aquaero plugin
 confflags += --disable-aquaero
 
+# Ganglia is not available in testing atm and hasn't been touched in a long
+# time, http://bugs.debian.org/812462
+confflags += --disable-gmond
+
 # libmic is required for the mic plugin
 confflags += --disable-mic