control: Build-conflict with libhal-dev to ensure consistent builds.

diff --git a/debian/changelog b/debian/changelog
index bb7e21431db919f4a94e085b308ca0e8a4a5fa96..2c000b35e28de1b4529c164732c17ce3a997af24 100644 (file)
--- 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 ba5be1248627402cc307aa3ab217d644f0fe35e5..f363477cee0ebb7764985db09b12cf652d6e6157 100644 (file)
--- 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