From a19f56390fc94d047d004d8ac14100384718a860 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Jan 2012 16:17:00 +0100 Subject: [PATCH] Revert "control, rules: Depend on libmodbus-dev and enabled "modbus" plugin." collectd does not currently seem to support modbus 3.0.1. This reverts commit e0686fba23bf1a76aa37efb828ab3acbbbcf9cc9. --- debian/changelog | 4 ---- debian/control | 1 - debian/rules | 3 +++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbd2059..963ff5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,6 @@ collectd (4.10.4-1) unstable; urgency=low (Closes: #625323). - Added support for libnotify 0.7; thanks to Michael Biebl for reporting this (Closes: #636818). - * debian/control, debian/rules: - - Depend on libmodbus-dev (which is now available in Debian) and enabled - "modbus" plugin; thanks to Ivo De Decker for reporting this - (Closes: #639796). * debian/patches: - Removed bts595756-notify_email-segfault -- included upstream. - Removed bts592623-curl_json-file -- included upstream. diff --git a/debian/control b/debian/control index f70f756..1fb6d82 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libglib2.0-dev, libhal-dev, libmemcached-dev, - libmodbus-dev, libmysqlclient-dev, libnotify-dev, libopenipmi-dev, diff --git a/debian/rules b/debian/rules index aa6f100..be4441e 100755 --- a/debian/rules +++ b/debian/rules @@ -62,6 +62,9 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \ # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape +# libmodbus is required for the modbus plugin. +confflags += --disable-modbus + # libnetapp is required for the netapp plugin. confflags += --disable-netapp -- 2.30.2