patches: Removed bts566199_collection_hide_types -- applied upstream.

diff --git a/debian/changelog b/debian/changelog
index c1b2e4a011056f9cc72fef1d492f3ae5ac3239ce..061c7187432714357610e0c3bc00259e5fc14d28 100644 (file)
--- 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 <tokkee@debian.org>  Thu, 03 Jun 2010 14:40:54 +0200
+ -- Sebastian Harl <tokkee@debian.org>  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 51fdf6c8ee1016487a2be336709b32f8c2f28b61..31f67e2af6d4729092a843a0aae26bb0e3e36102 100644 (file)
--- 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 (executable)
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
-## <piatruk.p@gmail.com>
-##
-## 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));
-     }