From: Sebastian Harl <sh@teamix.net>
Date: Thu, 22 Nov 2012 11:08:37 +0000 (+0100)
Subject: patches/: rrd_filter_path.dpatch: Also patch the migrate-4-5 script.
X-Git-Tag: collectd-5.2.0-1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4bb65faa49273e9e552c207fc13c4c1c0f707a7f;p=pkg-collectd.git

patches/: rrd_filter_path.dpatch: Also patch the migrate-4-5 script.

While this is not required for the (optional) auto-migration when updating the
package (the full path is passed as an argument) it helps the user to just use
the script without the need to add further arguments.

Thanks to Joey Hess for reporting this!
Closes: #689001
---

diff --git a/debian/changelog b/debian/changelog
index 5b3fe86..b89a6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ collectd (5.2.0-1) experimental; urgency=low
     - Removed rtnl_dump_filter.dpatch; merged upstream.
     - Added myplugin_includes.dpatch -- change the example plugin include path
       to /usr/include/collectd/core/ (see below).
+    - rrd_filter_path.dpatch: Also patch the migrate-4-5 script; while this is
+      not required for the (optional) auto-migration when updating the package
+      (the full path is passed as an argument) it helps the user to just use
+      the script without the need to add further arguments; thanks to Joey
+      Hess for reporting this (Closes: #689001).
   * debian/rules:
     - Fix installation paths used for Perl bindings. Upstream now passes
       INSTALL_BASE rather than PREFIX to Makefile.PL which resulted in the
diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch
index 2678334..4580bba 100755
--- a/debian/patches/rrd_filter_path.dpatch
+++ b/debian/patches/rrd_filter_path.dpatch
@@ -41,3 +41,17 @@ diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
  }
  
  sub exit_usage
+diff a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
+--- a/contrib/migrate-4-5.px
++++ b/contrib/migrate-4-5.px
+@@ -32,8 +32,8 @@
+ use File::Basename ('dirname');
+ 
+ our $InDir = '/var/lib/collectd';
+-our $RRDtool = 'rrdtool';
+-our $RRDFilter = 'rrd_filter.px';
++our $RRDtool = '/usr/bin/rrdtool';
++our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
+ 
+ our %TypesCounterToDerive = # {{{
+ (