control, rules: Build depend on libmodbus-dev and enabled modbus plugin.

5.1 now supports libmodbus 3; thanks to Ivo De Decker for reporting this.
Closes: #639796

diff --git a/debian/changelog b/debian/changelog
index 7aa7c6f16bada868ef83ff369bd80235928c70f3..7c75c283751c09cd587dee62331a3bcf9408dbf8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ collectd (5.1.0-2) UNRELEASED; urgency=low
 
   * debian/collectd-core.postinst:
     - Don't create unused temp. directory.
+  * debian/control, debian/rules:
+    - Build depend on libmodbus-dev and enabled modbus plugin. 5.1 now
+      supports libmodbus 3; thanks to Ivo De Decker for reporting this
+      (Closes: #639796).
 
  -- Sebastian Harl <tokkee@debian.org>  Fri, 29 Jun 2012 22:17:27 +0200
 

diff --git a/debian/control b/debian/control
index 4ff49fc7c6fc4d75825340b2807acf3993c2e7fb..7d587f1f835a2b489d82d834eb329a179d925921 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libhal-dev,
  libkvm-dev [kfreebsd-any],
  libmemcached-dev,
+ libmodbus-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -119,6 +120,7 @@ Description: statistics collection and monitoring daemon (core system)
    * Query and parse data from a memcache daemon: memcachec
    * statistics of the memcached distributed caching system: memcached
    * memory usage: memory
+   * read values from Modbus/TCP enabled devices: modbus
    * statistics from mon.itor.us: Monitorus (Perl based plugin)
    * multimeter statistics: multimeter
    * MySQL statistics provided by MySQL's "show status" command: mysql

diff --git a/debian/rules b/debian/rules
index 3cc537026da9142d0cc9ce12a1c7fdb1b77ff8a1..8e186fca503f58161e68ce7b29f782fb6c85366e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,6 @@ confflags += --disable-lpar
 # Solaris only (requires devinfo and kstat)
 confflags += --disable-tape
 
-# libmodbus is required for the modbus plugin.
-confflags += --disable-modbus
-
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp