patches/: Removed migrate-4-5-df.dpatch; merged upstream.

diff --git a/debian/changelog b/debian/changelog
index 8918e5bc76572863026022e2ae981d76ca0f5e92..c06a08d11929b5406eeead34270d8981905fcbe0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ collectd (5.2.0-1) UNRELEASED; urgency=low
   * debian/control, debian/rules:
     - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable
       the 'pf' plugin on non-kfreebsd systems.
+  * debian/patches:
+    - Removed migrate-4-5-df.dpatch; merged upstream.
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 11:35:22 +0100
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 390f00fb1aa3cb7a06b5310b837ac85a035c15d2..6321d1f38ad0d5568d4ddc75062041b7b953b090 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,3 @@ rrd_filter_path.dpatch
 collection_conf_path.dpatch
 bts559801_plugin_find_fix.dpatch
 rtnl_dump_filter.dpatch
-migrate-4-5-df.dpatch

diff --git a/debian/patches/migrate-4-5-df.dpatch b/debian/patches/migrate-4-5-df.dpatch
deleted file mode 100755 (executable)
index 6c6f3a9..0000000
--- a/debian/patches/migrate-4-5-df.dpatch
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## migrate-4-5-df.dpatch by Florian Forster <octo@collectd.org>
-##
-## DP: contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
-## DP: cf. upstream commit 605dab534eb2f0ee26446c157c9fdd2ad6e9427a
-
-@DPATCH@
-
-diff --git a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
-index d3ff796..c39b51b 100755
---- a/contrib/migrate-4-5.px
-+++ b/contrib/migrate-4-5.px
-@@ -33,6 +33,7 @@ use File::Basename ('dirname');
- 
- our $InDir = '/var/lib/collectd';
- our $RRDtool = 'rrdtool';
-+our $RRDFilter = 'rrd_filter.px';
- 
- our %TypesCounterToDerive = # {{{
- (
-@@ -184,7 +185,15 @@ sub handle_file # {{{
-   {
-     my $dir = join ('/', @path);
-     print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
--    print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+    if (($plugin eq 'df') and ($type eq 'df'))
-+    {
-+      print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-free.rrd\" --map free:value\n";
-+      print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-used.rrd\" --map used:value\n";
-+    }
-+    else
-+    {
-+      print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+    }
-   }
- } # }}} sub handle_file
- 
-@@ -223,10 +232,12 @@ migrate-4-5.px [OPTIONS]
- 
- Valid options are:
- 
--  --indir <dir>      Source directory
--                     Default: $InDir
--  --rrdtool <path>   Path to the RRDtool binary
--                     Default: $RRDtool
-+  --indir <dir>         Source directory
-+                        Default: $InDir
-+  --rrdtool <path>      Path to the RRDtool binary
-+                        Default: $RRDtool
-+  --rrdfilter <path>    Path to the rrd_filter.px script
-+                        Default: $RRDFilter
- 
- EOF
-   exit (1);
-@@ -234,8 +245,11 @@ EOF
- 
- GetOptions ("indir|i=s" => \$InDir,
-         "rrdtool=s" => \$RRDtool,
-+        "rrdfilter=s" => \$RRDFilter,
-         "help|h" => \&exit_usage) or exit_usage ();
- 
-+print "#!/bin/bash\n\n";
-+
- scan_dir ($InDir);
- 
- # vim: set sw=2 sts=2 et fdm=marker :