patches/: Added myplugin_includes.dpatch.

This patch changes the example plugin include path to
/usr/include/collectd/core according to the changes done in collectd-dev.

diff --git a/debian/changelog b/debian/changelog
index 786f20cec28813098a325e6696e55e143519d602..e64ac17c14d136785df8bc2fd7c9a06a93a9451b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ collectd (5.2.0-1) UNRELEASED; urgency=low
   * debian/patches:
     - Removed migrate-4-5-df.dpatch; merged upstream.
     - Removed rtnl_dump_filter.dpatch; merged upstream.
+    - Added myplugin_includes.dpatch -- change the example plugin include path
+      to /usr/include/collectd/core/ (see below).
   * 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/00list b/debian/patches/00list
index 070e1e06050c5577e7ac7cea3251b636e5404a1a..23aacf62e043c084fffcce668440b01881337668 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+myplugin_includes.dpatch
 bts559801_plugin_find_fix.dpatch

diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
new file mode 100644 (file)
index 0000000..2b252cf
--- /dev/null
+++ b/debian/patches/myplugin_includes.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## myplugin_includes.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Let the example plugin include the core headers from
+## DP: /usr/include/collectd/core.
+
+@DPATCH@
+
+diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
+--- a/contrib/examples/myplugin.c
++++ b/contrib/examples/myplugin.c
+@@ -38,9 +38,9 @@
+ 
+ #endif /* ! HAVE_CONFIG */
+ 
+-#include <collectd/collectd.h>
+-#include <collectd/common.h>
+-#include <collectd/plugin.h>
++#include <collectd/core/collectd.h>
++#include <collectd/core/common.h>
++#include <collectd/core/plugin.h>
+ 
+ /*
+  * data source definition: