From df765a79c830a72affa47a9889c2fe0130681e66 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 3 Jun 2010 14:59:42 +0200 Subject: [PATCH] patches: Removed bts566199_collection_hide_types -- applied upstream. --- debian/changelog | 4 +- debian/patches/00list | 1 - .../bts566199_collection_hide_types.dpatch | 38 ------------------- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100755 debian/patches/bts566199_collection_hide_types.dpatch diff --git a/debian/changelog b/debian/changelog index c1b2e4a..061c718 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ collectd (4.10.0-1) unstable; urgency=low * debian/control: - Build-depend on libprotobuf-c0-dev and protobuf-c-compiler required by the 'pinba' plugin. + * debian/patches: + - Removed bts566199_collection_hide_types -- applied upstream. - -- Sebastian Harl Thu, 03 Jun 2010 14:40:54 +0200 + -- Sebastian Harl Thu, 03 Jun 2010 14:59:18 +0200 collectd (4.9.1-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 51fdf6c..31f67e2 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -4,5 +4,4 @@ typo_fixes.dpatch bts561577_collectd2html_recursive_fix.dpatch bts557599_powerdns_fix.dpatch bts559801_plugin_find_fix.dpatch -bts566199_collection_hide_types.dpatch diff --git a/debian/patches/bts566199_collection_hide_types.dpatch b/debian/patches/bts566199_collection_hide_types.dpatch deleted file mode 100755 index 1851a70..0000000 --- a/debian/patches/bts566199_collection_hide_types.dpatch +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bts566199_collection_hide_types.dpatch by Pavel Piatruk -## -## -## DP: contrib/collection.cgi: Added ability to hide specified types. - -@DPATCH@ - -diff a/contrib/collection.cgi b/contrib/collection.cgi ---- a/contrib/collection.cgi -+++ b/contrib/collection.cgi -@@ -13,6 +13,7 @@ use Data::Dumper (); - - our $Config = "/etc/collection.conf"; - our @DataDirs = (); -+our @DontShowTypes = (); - our $LibDir; - - our $ValidTimespan = -@@ -78,6 +79,10 @@ sub read_config - $value =~ s#/*$##; - $LibDir = $value; - } -+ elsif ($key eq 'dontshowtype') -+ { -+ push (@DontShowTypes, $value); -+ } - else - { - print STDERR "Unknown key: $key\n"; -@@ -239,6 +244,7 @@ sub _find_types - my $name = "$_"; - $name =~ s/\.rrd$//i; - my ($type, $instance) = split (m/-/, $name, 2); -+ if (grep { $_ eq $type } @DontShowTypes) { next; } - $types{$type} = [] if (!$types{$type}); - push (@{$types{$type}}, $instance) if (defined ($instance)); - } -- 2.30.2