control, rules: Depend on libmodbus-dev and enabled "modbus" plugin.

diff --git a/debian/changelog b/debian/changelog
index f71bb22d53f21e5882e29ff6b5f3dbac32ee0abc..22389e2cb548e18f14054c342b3b36fc78747ef4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,12 @@ collectd (4.10.4-1) unstable; urgency=low
       Steigerwald for reporting this (Closes: #585975).
     - Don't abort if including a config file fails; thanks to Reinhard Tartler
       for reporting this (Closes: #592880).
+  * 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).
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jan 2012 15:01:31 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jan 2012 15:05:15 +0100
 
 collectd (4.10.1-2.1) unstable; urgency=high
 

diff --git a/debian/control b/debian/control
index 1fb6d822be372965737321c0ec95fb7d5d6dc2aa..f70f756463ee2c874cc4ddaa069274fd12833ab2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ 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 ce981a4b997b84c255f8c0c4578d39e475876732..ea5ec27e83bbad98ab54d8cc1e1c995f6e1231ab 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,9 +62,6 @@ 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