Adapt to new daemon/ subdirectory in upstream source

diff --git a/debian/changelog b/debian/changelog
index c79e935df1bcf4ecd0c289c5e385bd8009969164..125a24d4b09d503fb43ea64126638a8c053f9be9 100644 (file)
--- 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 5696e472171b4488e65f6b9ca4f636af6ab2c758..a3dd6785c5d840ef2d782a6d1019eedc091c6c44 100644 (file)
--- 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 2b252cfc1b665130a97f2ff5e27ebf25c196cf13..fdcbde800d90785a2ae4fdf1a0067dde9021cb9d 100755 (executable)
--- 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: