rules, control: Disabled modbus plugin.

libmodbus-dev is not available on Squeeze.

diff --git a/debian/changelog b/debian/changelog
index ab3520ec5c2394ef7abdc5f5fa83dd37b68e2519..45bada0b7c6b958a99ab7d8294f1294b77ef6897 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 collectd (5.1.0-3~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.
+  * debian/rules, debian/control:
+    - Disabled modbus plugin, libmodbus-dev is not available on Squeeze.
 
  -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jul 2012 13:39:28 +0200
 

diff --git a/debian/control b/debian/control
index 7d587f1f835a2b489d82d834eb329a179d925921..4ff49fc7c6fc4d75825340b2807acf3993c2e7fb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ 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,
@@ -120,7 +119,6 @@ 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 8e186fca503f58161e68ce7b29f782fb6c85366e..03e769862b77dea57037a3a7eca51df4f8b48669 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,10 @@ confflags += --disable-xmms
 # libkstat is required for the xfs_arc plugin.
 confflags += --disable-zfs-arc
 
+# build-deps for these plugins are not available on Squeeze
+confflags += \
+               --disable-modbus
+
 # The static library netstat cannot be linked into shared objects on some
 # architectures (see bugs #358637, #419684 and #524593 for more details).
 ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))