Merged branch 'experimental' into debmon-squeeze

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 70d6b7a36ff5d30d9aa16651de1a73b336d5553d..4ae15fca5befcfab82df432f29aa8ef539bfe926 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,24 @@ collectd (5.2.0-2) experimental; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Thu, 29 Nov 2012 09:09:51 +0100
 
+collectd (5.2.0-1~debmon60+1) debmon-squeeze; urgency=low
+
+  * Rebuild for debmon-squeeze.
+  * debian/rules:
+    - Re-enabled the netlink plugin (previously disabled for
+      squeeze-backports); the plugin should now build with older and current
+      versions of iproute2.
+  Changes kept from squeeze-backports:
+  * debian/rules, debian/control:
+    - Disabled modbus plugin, libmodbus-dev is not available on Squeeze.
+    - Disabled AMQP plugin, librabbitmq-dev is not available on Squeeze.
+  * debian/rules, debian/collectd-core.overrides:
+    - Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk (without arch).
+  * debian/collectd.conf:
+    - Removed sample config for the 'amqp' plugin.
+
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 28 Nov 2012 09:06:28 +0100
+
 collectd (5.2.0-1) experimental; urgency=low
 
   * New upstream release:
@@ -63,6 +81,25 @@ collectd (5.2.0-1) experimental; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 15:40:12 +0100
 
+collectd (5.1.0-3~bpo60+2) squeeze-backports; urgency=low
+
+  * Disable the netlink plugin, as it does not compile anyways
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 24 Nov 2012 14:46:58 +0100
+
+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.
+    - Disabled AMQP plugin, librabbitmq-dev is not available on Squeeze.
+  * debian/rules, debian/collectd-core.overrides:
+    - Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk (without arch).
+  * debian/collectd.conf:
+    - Removed sample config for the 'amqp' plugin.
+
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 03 Aug 2012 12:04:12 +0000
+
 collectd (5.1.0-3) unstable; urgency=low
 
   * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:
@@ -334,6 +371,87 @@ collectd (4.10.1-2) unstable; urgency=medium
 
  -- Sebastian Harl <tokkee@debian.org>  Wed, 08 Sep 2010 22:50:54 +0200
 
+collectd (4.10.1-1+squeeze1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * debian/control:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+    - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
+      not available in Lenny.
+    - Build-depend on libsensors-dev, rather than libsensors4-dev, which is
+      not available in Lenny. This limits the functionality of the "sensors"
+      plugin which does not work well with libsensors3 and lm-sensors-3
+      (Re-opens: #538795).
+    - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the
+      right combination of libsnmp-dev and perl, which might confuse buildds
+      on Lenny. Lenny is not affected by #559087 (see 4.8.2-1).
+  * debian/collectd.conf, debian/control, debian/rules:
+    - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
+      not available in Lenny; removed build-dependency on libganglia-dev.
+    - Disabled the "memcachec" plugin, which requires libmemcached which is
+      not available in Lenny; removed build-dependency on libmemcached-dev.
+    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
+      is not available in Lenny; removed libtokyocabinet-dev and
+      libtokyotyrant-dev build-dependencies.
+    - Disabled the "curl_json" plugin, which requires libyajl which is not
+      available in Lenny; removed libyajl-dev build-dependency.
+    - Disabled the "pinba" plugin, which requires protobuf which is not
+      available in Lenny; removed libprotobuf-c0-dev and protobuf-c-compiler
+      build-dependencies.
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 21 Sep 2010 00:10:55 +0200
+
+collectd (4.10.1-1+squeeze1) testing-proposed-updates; urgency=medium
+
+  * debian/rules:
+    - Added support for ‘powerpcspe’ to the Java arch mapping; thanks to
+      Sebastian Andrzej Siewior for the patch (Closes: #592909).
+  * debian/patches:
+    - Added bts595756-notify_email-segfault -- upstream patch fixing a
+      segfault in the 'notify_email' plugin; thanks to Manuel CISSE for
+      reporting this (Closes: #595756).
+    - Added bts592623-curl_json-file -- upstream patch fixing access to
+      file:// URLs in the 'curl_json' plugin; thanks Baptiste Mille-Mathias
+      for reporting this and pointing out the patch (Closes: #592623).
+    - Added bts596128-reheap-fix -- upstream patch fixing the 'reheap()'
+      function used to manage the "read" callbacks and making sure all plugins
+      get executed correctly and in each interval (Closes: #596128).
+  * Set urgency to "medium" because of the RC bug-fix.
+
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 12 Sep 2010 13:53:37 +0200
+
+collectd (4.10.1-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * debian/control:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+    - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
+      not available in Lenny.
+    - Build-depend on libsensors-dev, rather than libsensors4-dev, which is
+      not available in Lenny. This limits the functionality of the "sensors"
+      plugin which does not work well with libsensors3 and lm-sensors-3
+      (Re-opens: #538795).
+    - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the
+      right combination of libsnmp-dev and perl, which might confuse buildds
+      on Lenny. Lenny is not affected by #559087 (see 4.8.2-1).
+  * debian/collectd.conf, debian/control, debian/rules:
+    - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
+      not available in Lenny; removed build-dependency on libganglia-dev.
+    - Disabled the "memcachec" plugin, which requires libmemcached which is
+      not available in Lenny; removed build-dependency on libmemcached-dev.
+    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
+      is not available in Lenny; removed libtokyocabinet-dev and
+      libtokyotyrant-dev build-dependencies.
+    - Disabled the "curl_json" plugin, which requires libyajl which is not
+      available in Lenny; removed libyajl-dev build-dependency.
+    - Disabled the "pinba" plugin, which requires protobuf which is not
+      available in Lenny; removed libprotobuf-c0-dev and protobuf-c-compiler
+      build-dependencies.
+
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 10 Sep 2010 22:29:17 +0200
+
 collectd (4.10.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -380,6 +498,42 @@ collectd (4.10.0-1) unstable; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 08 Jun 2010 00:42:56 +0200
 
+collectd (4.9.1-2~bpo50+2) lenny-backports; urgency=low
+
+  * debian/control:
+    - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the
+      right combination of libsnmp-dev and perl, which might confuse buildds
+      on Lenny. Lenny is not affected by #559087 (see 4.8.2-1).
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 08 Apr 2010 20:05:46 +0200
+
+collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * debian/control:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+    - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
+      not available in Lenny.
+    - Build-depend on libsensors-dev, rather than libsensors4-dev, which is
+      not available in Lenny. This limits the functionality of the "sensors"
+      plugin which does not work well with libsensors3 and lm-sensors-3
+      (Re-opens: #538795).
+  * debian/collectd.conf, debian/control, debian/rules:
+    - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
+      not available in Lenny; removed build-dependency on libganglia-dev.
+    - Disabled the "memcachec" plugin, which requires libmemcached which is
+      not available in Lenny; removed build-dependency on libmemcached-dev.
+    - Disabled the "rrdcached" plugin, which requires rrdclient support in
+      librrd; removed version from librrd-dev build-dependency.
+    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
+      is not available in Lenny; removed libtokyocabinet-dev and
+      libtokyotyrant-dev build-dependencies.
+    - Disabled the "curl_json" plugin, which requires libyajl which is not
+      available in Lenny; removed libyajl-dev build-dependency.
+
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:31:30 +0100
+
 collectd (4.9.1-2) unstable; urgency=low
 
   * debian/rules:
@@ -660,6 +814,40 @@ collectd (4.7.2-1) unstable; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 29 Aug 2009 12:42:15 +0200
 
+collectd (4.6.3-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * Remaining changes:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 17:06:37 +0200
+
+collectd (4.6.3-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * debian/control:
+    - Removed dpkg-dev build-dependency - we don't care about Vcs-* and
+      Homepage fields in backports.org.
+    - Removed optional build-dependencies libcurl4-gnutls-dev, librrd-dev and
+      libsnmp-dev - they are not available in Etch and might confuse buildds.
+    - Switch back to build-depend on nut-dev - libupsclient1-dev is not
+      available in Etch and limit the "nut" plugin to [!alpha !amd64 !hppa
+      !ia64 !ppc64 !mips !mipsel].
+    - Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+  * debian/control, debian/rules:
+    - Added a work around for #474087 (broken openipmi .pc files) by providing
+      a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adding
+      that path to PKG_CONFIG_PATH. Removed the version from the
+      libopenipmi-dev build dependency - Etch does not include a fixed version
+      of openipmi.
+    - Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
+      libdbi is not available on Etch.
+
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 13:52:04 +0200
+
 collectd (4.6.3-1) unstable; urgency=low
 
   * New upstream release.
@@ -812,6 +1000,25 @@ collectd (4.5.1-1) experimental; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri, 12 Dec 2008 10:09:48 +0100
 
+collectd (4.4.2-3~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev, librrd-dev and
+    libsnmp-dev - they are not available in Etch and might confuse buildds.
+  * Switch back to build-depend on nut-dev - libupsclient1-dev is not
+    available in Etch:
+    - Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64].
+  * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+  * Build-conflict with iptables-dev to force the use of the shipped libiptc
+    (this allows building the iptables plugin on all architectures).
+  * Reenabled and fixed the work around for #474087 (broken openipmi .pc
+    files) and removed the version from the libopenipmi-dev build dependency -
+    Etch does not include a fixed version of openipmi.
+
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Dec 2008 11:10:56 +0100
+
 collectd (4.4.2-3) unstable; urgency=low
 
   * New debconf template translation:
@@ -877,6 +1084,23 @@ collectd (4.4.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 19:58:58 +0200
 
+collectd (4.4.1-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Switch back to build-depend on nut-dev - libupsclient1-dev is not
+    available in Etch:
+    - Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64].
+  * No longer remove version from libvirt-dev build-dependency - a version
+    with Xen support is now available on backports.org.
+  * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+  * Build-conflict with iptables-dev to force the use of the shipped libiptc.
+
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 20 Aug 2008 10:52:14 +0200
+
 collectd (4.4.1-2) unstable; urgency=low
 
   * Restrict libcurl4-gnutls-dev build dependency to versions which are not
@@ -924,6 +1148,19 @@ collectd (4.4.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Tue, 17 Jun 2008 10:35:51 +0200
 
+collectd (4.3.2-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+  * Reenabled the "iptables" plugin - libiptc is available in Etch.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Apr 2008 16:48:59 +0200
+
 collectd (4.3.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -944,6 +1181,18 @@ collectd (4.3.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Mon, 31 Mar 2008 12:13:18 +0200
 
+collectd (4.3.0-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 27 Mar 2008 13:13:13 +0100
+
 collectd (4.3.0-2) unstable; urgency=low
 
   * Added "lm-sensors" to the recommended packages and README.Debian.plugins
@@ -1158,6 +1407,12 @@ collectd (3.10.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri,  3 Nov 2006 15:18:17 +0000
 
+collectd (3.10.1-4~bpo.1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Oct 2006 10:50:22 +0000
+
 collectd (3.10.1-4) unstable; urgency=low
 
   * Changed collectd-dbg's section and priority to "devel" and "extra"
@@ -1167,6 +1422,13 @@ collectd (3.10.1-4) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Thu,  5 Oct 2006 10:25:07 +0000
 
+collectd (3.10.1-2bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun,  6 Aug 2006 14:17:57 +0200
+
 collectd (3.10.1-3) unstable; urgency=low
 
   * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).
@@ -1190,6 +1452,13 @@ collectd (3.10.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Sat, 22 Jul 2006 21:43:37 +0200
 
+collectd (3.10.0-0bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 21 Jul 2006 16:23:53 +0200
+
 collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index ec28843e0f0552c27f32b32d6479c9860ae54318..f96f0c9762ab278d89e2c7f4fd5b0319bcbc69dc 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-*
+collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk/jre/lib/*
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index a422f4079d63729e7aeae7ba5a32447fa2c71c93..a367cdd3c04ce23ea94dc668c17cfb9466ddd894 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -59,7 +59,6 @@ LoadPlugin syslog
 ##############################################################################
 
 #LoadPlugin aggregation
-#LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
 #LoadPlugin ascent
@@ -177,20 +176,6 @@ 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 6763c94aa4c72a1efb6aceca15522f8a35599fef..cd99cc3b3dcd539914e1ff6e81d614dffa4e51c7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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,
@@ -26,7 +25,6 @@ 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~))
@@ -81,7 +79,6 @@ 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
@@ -121,7 +118,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 af70f20dc99c346a4e4cc896643194aa948b98b2..6da01b59c48099752734f5a40c9069959f818118 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-$(DEB_BUILD_ARCH)
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
@@ -89,6 +89,11 @@ 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)))