From a0f6fea4a1b1ebb067b1b1288d3fa3db1ad19806 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 16 Sep 2013 21:03:26 +0200 Subject: [PATCH] control: Build-conflict with libhal-dev to ensure consistent builds. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb7e214..2c000b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ collectd (5.4.0-1) UNRELEASED; urgency=low - Removed build-dependency on libhal-dev; HAL is deprecated and will be removed from Debian. It was optionally used by the uuid plugin. (Closes: #615203) + - Build-conflict with libhal-dev to ensure consistent builds (cf. #615203). - Let libcollectdclient-dev replace/break collectd-dev (<= 5.2.0-1) because it ships files previously shipped by that package; thanks to Andreas Beckmann for reporting this (Closes: #717973). diff --git a/debian/control b/debian/control index ba5be12..f363477 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64], protobuf-c-compiler, python-dev -Build-Conflicts: libpthread-dev +Build-Conflicts: libpthread-dev, libhal-dev Standards-Version: 3.9.4 Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git -- 2.30.2