Remove collection.cgi.dpatch, also applied upstream

diff --git a/debian/changelog b/debian/changelog
index ed28ab142e1286df3e4a4cfecabfe813828d102b..7d5f3a62189aaca48c221d0a00fca28f95d844e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ collectd (5.5.0-1) UNRELEASED; urgency=medium
     - Removed bts770690_java_jni_thread_detach.dpatch; merged upstream.
     - Removed bts770693_timestamps.dpatch; merged upstream.
     - Removed bts770694_loglevel.dpatch; merged upstream.
+    - Removed collection.cgi.dpatch; merged upstream.
     - Removed myplugin_api.dpatch; merged upstream.
   * debian/collectd-dev.install, myplugin_includes.dpatch:
     - Update path to header files moved to daemon/ subdirectory upstream.

diff --git a/debian/patches/00list b/debian/patches/00list
index f2785c352810128f3476661f4e721edac42051c1..c40ff1abbedd73937952776927910d349791b080 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-collection.cgi.dpatch
 myplugin_includes.dpatch

diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
deleted file mode 100755 (executable)
index 5156449..0000000
--- a/debian/patches/collection.cgi.dpatch
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## collection.cgi.dpatch by Fabiano Pires <fxp@ig.com.br>
-##
-## DP: collection.cgi: Fixed apache data-sources.
-
-@DPATCH@
-
-diff a/contrib/collection.cgi b/contrib/collection.cgi
---- a/contrib/collection.cgi
-+++ b/contrib/collection.cgi
-@@ -957,9 +957,9 @@
- 
-   $GraphDefs =
-   {
--    apache_bytes => ['DEF:min_raw={file}:count:MIN',
--    'DEF:avg_raw={file}:count:AVERAGE',
--    'DEF:max_raw={file}:count:MAX',
-+    apache_bytes => ['DEF:min_raw={file}:value:MIN',
-+    'DEF:avg_raw={file}:value:AVERAGE',
-+    'DEF:max_raw={file}:value:MAX',
-     'CDEF:min=min_raw,8,*',
-     'CDEF:avg=avg_raw,8,*',
-     'CDEF:max=max_raw,8,*',
-@@ -976,9 +976,9 @@
-     'GPRINT:avg:LAST:%5.1lf%s Last',
-     'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
-     ],
--   apache_connections => ['DEF:min={file}:count:MIN',
--    'DEF:avg={file}:count:AVERAGE',
--    'DEF:max={file}:count:MAX',
-+   apache_connections => ['DEF:min={file}:value:MIN',
-+    'DEF:avg={file}:value:AVERAGE',
-+    'DEF:max={file}:value:MAX',
-     "AREA:max#$HalfBlue",
-     "AREA:min#$Canvas",
-     "LINE1:avg#$FullBlue:Connections",
-@@ -987,9 +987,9 @@
-     'GPRINT:max:MAX:%6.2lf Max,',
-     'GPRINT:avg:LAST:%6.2lf Last'
-     ],
--    apache_idle_workers => ['DEF:min={file}:count:MIN',
--    'DEF:avg={file}:count:AVERAGE',
--    'DEF:max={file}:count:MAX',
-+    apache_idle_workers => ['DEF:min={file}:value:MIN',
-+    'DEF:avg={file}:value:AVERAGE',
-+    'DEF:max={file}:value:MAX',
-     "AREA:max#$HalfBlue",
-     "AREA:min#$Canvas",
-     "LINE1:avg#$FullBlue:Idle Workers",
-@@ -998,9 +998,9 @@
-     'GPRINT:max:MAX:%6.2lf Max,',
-     'GPRINT:avg:LAST:%6.2lf Last'
-     ],
--    apache_requests => ['DEF:min={file}:count:MIN',
--    'DEF:avg={file}:count:AVERAGE',
--    'DEF:max={file}:count:MAX',
-+    apache_requests => ['DEF:min={file}:value:MIN',
-+    'DEF:avg={file}:value:AVERAGE',
-+    'DEF:max={file}:value:MAX',
-     "AREA:max#$HalfBlue",
-     "AREA:min#$Canvas",
-     "LINE1:avg#$FullBlue:Requests/s",
-@@ -1009,9 +1009,9 @@
-     'GPRINT:max:MAX:%6.2lf Max,',
-     'GPRINT:avg:LAST:%6.2lf Last'
-     ],
--    apache_scoreboard => ['DEF:min={file}:count:MIN',
--    'DEF:avg={file}:count:AVERAGE',
--    'DEF:max={file}:count:MAX',
-+    apache_scoreboard => ['DEF:min={file}:value:MIN',
-+    'DEF:avg={file}:value:AVERAGE',
-+    'DEF:max={file}:value:MAX',
-     "AREA:max#$HalfBlue",
-     "AREA:min#$Canvas",
-     "LINE1:avg#$FullBlue:Processes",