collectd-dev.install: Install the headers to /usr/include/collectd/core/.

… rather than /usr/include/collectd/. The latter is used by libcollectdclient
which causes file conflicts.

diff --git a/debian/changelog b/debian/changelog
index 1cd92ecfae5eaec52c76d417860177c57a41638b..786f20cec28813098a325e6696e55e143519d602 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ collectd (5.2.0-1) UNRELEASED; urgency=low
     bump.
   * debian/libcollectdclient1.symbols:
     - Updated for 5.2.
+  * debian/collectd-dev.install:
+    - Install the collectd (daemon) headers to /usr/include/collectd/core/
+      rather than /usr/include/collectd/. The latter is used by
+      libcollectdclient which causes file conflicts.
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 11:35:22 +0100
 

diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install
index ea6252fdeb8a5a0ed96526c2aa84d545a9bca670..5696e472171b4488e65f6b9ca4f636af6ab2c758 100644 (file)
--- a/debian/collectd-dev.install
+++ b/debian/collectd-dev.install
@@ -1,3 +1,3 @@
 src/liboconfig/oconfig.h usr/include/collectd/liboconfig
-src/*.h usr/include/collectd
+src/*.h usr/include/collectd/core