From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 30 Jun 2015 05:37:53 +0000 (+0200)
Subject: Adapt to new daemon/ subdirectory in upstream source
X-Git-Tag: collectd-5.5.0-1~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0dfeee6ab362bcaf5050d9066e8ce1dc12e72b48;p=pkg-collectd.git

Adapt to new daemon/ subdirectory in upstream source
---

diff --git a/debian/changelog b/debian/changelog
index c79e935..125a24d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ collectd (5.5.0-1) UNRELEASED; urgency=medium
     - Removed bts770693_timestamps.dpatch; merged upstream.
     - Removed bts770694_loglevel.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.
 
  -- Marc Fournier <marc.fournier@camptocamp.com>  Tue, 30 Jun 2015 07:08:39 +0200
 
diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install
index 5696e47..a3dd678 100644
--- a/debian/collectd-dev.install
+++ b/debian/collectd-dev.install
@@ -1,3 +1,4 @@
 src/liboconfig/oconfig.h usr/include/collectd/liboconfig
 src/*.h usr/include/collectd/core
+src/daemon/*.h usr/include/collectd/core/daemon
 
diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
index 2b252cf..fdcbde8 100755
--- a/debian/patches/myplugin_includes.dpatch
+++ b/debian/patches/myplugin_includes.dpatch
@@ -16,9 +16,9 @@ diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
 -#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>
++#include <collectd/core/daemon/collectd.h>
++#include <collectd/core/daemon/common.h>
++#include <collectd/core/daemon/plugin.h>
  
  /*
   * data source definition: