From 5807c6c5a9ea9bc517ce0b348a83f6942e74dd68 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 20 Nov 2012 15:14:16 +0100 Subject: [PATCH] collectd-dev.install: Install the headers to /usr/include/collectd/core/. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … rather than /usr/include/collectd/. The latter is used by libcollectdclient which causes file conflicts. --- debian/changelog | 4 ++++ debian/collectd-dev.install | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1cd92ec..786f20c 100644 --- 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 Tue, 20 Nov 2012 11:35:22 +0100 diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install index ea6252f..5696e47 100644 --- 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 -- 2.30.2