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.

diff --git a/debian/changelog b/debian/changelog
index bbd20597a32404674a929857a443a3039a30c5b1..963ff5bd037c92f2a8091ece19d284dfda1410c5 100644 (file)
--- 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 f70f756463ee2c874cc4ddaa069274fd12833ab2..1fb6d822be372965737321c0ec95fb7d5d6dc2aa 100644 (file)
--- 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 aa6f1005dfcba9fd488a9385744722f4ca614cc1..be4441ed30ea95183a4f1515c941e6404570c09e 100755 (executable)
--- 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