![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@teamix.net> | |
| Wed, 5 Dec 2012 12:57:37 +0000 (13:57 +0100) | ||
| committer | Sebastian Harl <sh@teamix.net> | |
| Wed, 5 Dec 2012 12:57:37 +0000 (13:57 +0100) |
Conflicts:
debian/changelog
debian/changelog
| 1 | 2 | |||
|---|---|---|---|---|
| debian/changelog | patch | | diff1 | | diff2 | | blob | history |
| debian/collectd.conf | patch | | diff1 | | diff2 | | blob | history |
diff --combined debian/changelog
index 93fe69df829ddff1cc544042bdf3f596d032d561,70d6b7a36ff5d30d9aa16651de1a73b336d5553d..4ae15fca5befcfab82df432f29aa8ef539bfe926
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
+ collectd (5.2.0-2) experimental; urgency=low
+
+ * debian/patches:
+ - Added postgresql_writer_memleak.dpatch fixing a memory leak in the
+ PostgreSQL writer implementation.
+
+ -- 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:
-- 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:
-- 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.
-- 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:
-- 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.
-- 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:
-- 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
-- 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.
-- 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
-- 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"
-- 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).
-- 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 --combined debian/collectd.conf
index 43a76fa819dbd56f3885345cdef99d95ef5bebb6,a422f4079d63729e7aeae7ba5a32447fa2c71c93..a367cdd3c04ce23ea94dc668c17cfb9466ddd894
+++ b/debian/collectd.conf
##############################################################################
#LoadPlugin aggregation
-#LoadPlugin amqp
#LoadPlugin apache
#LoadPlugin apcups
#LoadPlugin ascent
#LoadPlugin memcachec
#LoadPlugin memcached
LoadPlugin memory
+ #LoadPlugin modbus
#LoadPlugin multimeter
#LoadPlugin mysql
#LoadPlugin netlink
# </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"
# </Instance>
#</Plugin>
+ #<Plugin modbus>
+ # <Data "data_name">
+ # RegisterBase 1234
+ # RegisterType float
+ # Type gauge
+ # Instance "..."
+ # </Data>
+ #
+ # <Host "name">
+ # Address "addr"
+ # Port "1234"
+ # Interval 60
+ #
+ # <Slave 1>
+ # Instance "foobar" # optional
+ # Collect "data_name"
+ # </Slave>
+ # </Host>
+ #</Plugin>
+
#<Plugin mysql>
# <Database db_name>
# Host "database.serv.er"