Re-enabled the modbus and AMQP plugins.

… which were previously disabled for Squeeze.

diff --git a/debian/changelog b/debian/changelog
index 9699934b939772a74e3d6b51879a8ca0e77428ac..210c78eb4a6f43eae80627e5f692da266a72bece 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 collectd (5.2.0-1~debmon70+1) UNRELEASED; urgency=low
 
   * Rebuild for debmon-wheezy.
+  * Re-enabled the modbus and AMQP plugins which were previously disabled for
+    Squeeze.
 
  -- Sebastian Harl <tokkee@debian.org>  Wed, 28 Nov 2012 12:37:29 +0100
 

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index f96f0c9762ab278d89e2c7f4fd5b0319bcbc69dc..ec28843e0f0552c27f32b32d6479c9860ae54318 100644 (file)
--- a/debian/collectd-core.overrides
+++ b/debian/collectd-core.overrides
@@ -10,5 +10,5 @@ collectd-core: capitalization-error-in-description python Python
 # The "java" plugin uses libjvm.so which can only be found in a non-standard
 # directory. According to the Java guys the path name and the ABI is stable
 # though ...
-collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk/jre/lib/*
+collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk-*
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 43a76fa819dbd56f3885345cdef99d95ef5bebb6..9b6acea671c57ddd8e9f43ad8073f12276a097b6 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -59,6 +59,7 @@ LoadPlugin syslog
 ##############################################################################
 
 #LoadPlugin aggregation
+#LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
 #LoadPlugin ascent
@@ -175,6 +176,20 @@ LoadPlugin users
 #      </Aggregation>
 #</Plugin>
 
+#<Plugin amqp>
+#      <Publish "name">
+#              Host "localhost"
+#              Port "5672"
+#              VHost "/"
+#              User "guest"
+#              Password "guest"
+#              Exchange "amq.fanout"
+#              RoutingKey "collectd"
+#              Persistent false
+#              StoreRates false
+#      </Publish>
+#</Plugin>
+
 #<Plugin apache>
 #      <Instance "foo">
 #              URL "http://localhost/server-status?auto"

diff --git a/debian/control b/debian/control
index cd99cc3b3dcd539914e1ff6e81d614dffa4e51c7..6763c94aa4c72a1efb6aceca15522f8a35599fef 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,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,
@@ -25,6 +26,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libperl-dev,
  libpq-dev,
  libprotobuf-c0-dev,
+ librabbitmq-dev,
  librrd-dev (>= 1.4~),
  libsensors4-dev [linux-any],
 # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
@@ -79,6 +81,7 @@ Description: statistics collection and monitoring daemon (core system)
  default configuration) on top of it without having to modify the "collectd"
  package.
  .
+   * AMQP output plugin: amqp
    * Apache and lighttpd statistics provided by mod_status: apache
    * APC UPS's charge, load, input/output/battery voltage, etc.: apcups
    * Ascent server statistics: ascent
@@ -118,6 +121,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 6da01b59c48099752734f5a40c9069959f818118..af70f20dc99c346a4e4cc896643194aa948b98b2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH))
 ifeq (,$(JAVA_ARCHDIR))
        JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
 endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
@@ -89,11 +89,6 @@ 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-amqp \
-               --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)))