From 7301f676e2790e75ddc1f928632245af6f775b19 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 22 Dec 2009 00:41:59 +0100 Subject: [PATCH] patches: Removed gmond-fix-compile-error.dpatch. This patch has been included upstream. --- debian/changelog | 4 ++- debian/patches/00list | 1 - debian/patches/gmond-fix-compile-error.dpatch | 25 ------------------- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/gmond-fix-compile-error.dpatch diff --git a/debian/changelog b/debian/changelog index ad9dd5e..10f416a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,10 @@ collectd (4.8.2-1) unstable; urgency=low net-snmp has been fixed to handle that correctly in 5.4.2.1~dfsg-4; thanks to Lamont Jones and Dann Frazier for reporting this (Closes: #559087). + * debian/patches: + - Removed gmond-fix-compile-error.dpatch -- included upstream. - -- Sebastian Harl Mon, 21 Dec 2009 23:43:14 +0100 + -- Sebastian Harl Tue, 22 Dec 2009 00:41:03 +0100 collectd (4.8.1-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index b21ebd3..332b35c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ rrd_filter_path.dpatch collection_conf_path.dpatch -gmond-fix-compile-error.dpatch diff --git a/debian/patches/gmond-fix-compile-error.dpatch b/debian/patches/gmond-fix-compile-error.dpatch deleted file mode 100644 index c4f8e72..0000000 --- a/debian/patches/gmond-fix-compile-error.dpatch +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gmond-fix-compile-error.dpatch by Sebastian Harl -## -## DP: gmond plugin: Fixed a typo. -## DP: -## DP: For some reason, the value_t members "derive" and "absolute" had been -## DP: spelled in all capital letters, obviously resulting in a build error. - -@DPATCH@ - -diff a/src/gmond.c b/src/gmond.c ---- a/src/gmond.c -+++ b/src/gmond.c -@@ -542,9 +542,9 @@ static int staging_entry_update (const char *host, const char *name, /* {{{ */ - else if (ds_type == DS_TYPE_GAUGE) - se->vl.values[ds_index].gauge = value.gauge; - else if (ds_type == DS_TYPE_DERIVE) -- se->vl.values[ds_index].DERIVE += value.derive; -+ se->vl.values[ds_index].derive += value.derive; - else if (ds_type == DS_TYPE_ABSOLUTE) -- se->vl.values[ds_index].ABSOLUTE = value.absolute; -+ se->vl.values[ds_index].absolute = value.absolute; - - se->flags |= (0x01 << ds_index); - -- 2.30.2