patches: Removed network-fix-cacheflush.dpatch.

This patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index d0c307a8f1d198b5c153b2bac0ccb4786b123c3f..617f21a86ca9a122af486ab6379a8f746e740cd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ collectd (4.8.1-1) unstable; urgency=low
     - Removed bts542859-df-fix-ignorelist.dpatch - included upstream.
     - Removed java-fix-jvm-start.dpatch - included upstream.
     - Removed libvirt-reconnect.dpatch - included upstream.
+    - Removed network-fix-cacheflush.dpatch - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 19:20:07 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 19:22:11 +0200
 
 collectd (4.7.2-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 1788169ccd3cb5446986ff342c18090f373cd49e..5ca4c380b9b2436ba1641b0084007db5b5a8916d 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-network-fix-cacheflush.dpatch
 plugin-fix-unregister.dpatch
 

diff --git a/debian/patches/network-fix-cacheflush.dpatch b/debian/patches/network-fix-cacheflush.dpatch
deleted file mode 100755 (executable)
index 252aea8..0000000
--- a/debian/patches/network-fix-cacheflush.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## network-fix-cacheflush.dpatch by Florian Forster <octo@verplant.org>
-##
-## DP: network plugin: Fix an incorrectly used configuration variable.
-## DP:
-## DP: The `CacheFlush' option was assigned to the `TTL' variable.
-
-@DPATCH@
-
-diff a/src/network.c b/src/network.c
---- a/src/network.c
-+++ b/src/network.c
-@@ -2768,7 +2768,7 @@ static int network_config_set_cache_flush (const oconfig_item_t *ci) /* {{{ */
- 
-   tmp = (int) ci->values[0].value.number;
-   if (tmp > 0)
--    network_config_ttl = tmp;
-+    cache_flush_interval = tmp;
- 
-   return (0);
- } /* }}} int network_config_set_cache_flush */