From: Sebastian Harl Date: Thu, 18 Dec 2008 09:19:20 +0000 (+0100) Subject: Merged commit 'collectd-4.4.2-3' into etch-backports. X-Git-Tag: collectd-4.4.2-3--bpo40+1~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a038ac0eb19f258172af6d839879a06443cf6f7;p=pkg-collectd.git Merged commit 'collectd-4.4.2-3' into etch-backports. --- 0a038ac0eb19f258172af6d839879a06443cf6f7 diff --cc debian/changelog index 78b11fc,3ff6699..d1dd145 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,68 +1,85 @@@ + collectd (4.4.2-3) unstable; urgency=low + + * New debconf template translation: + - nl.po, thanks to Eric Spreen (Closes: #502204). + - sv.po, thanks to Martin Bagge (Closes: #504248). + * debian/patches: + - Added pod-errors.dpatch to fix some minor POD errors. + * debian/rules: + - Remove generated manpages in the clean target to avoid cluttering the + source diff with the rebuilt manpages. + * debian/collectd.conf: + - Fixed a wrong type used in the "tail" plugin example. + + -- Sebastian Harl Sat, 06 Dec 2008 16:53:25 +0100 + + collectd (4.4.2-2) unstable; urgency=low + + * Removed the work around for #474087 (broken openipmi .pc files) introduced + in 4.4.1-1 and instead build depend on libopenipmi-dev (>= 2.0.14-1~) + which includes fixed .pc files. This fixes an undefined symbol error when + loading the ipmi plugin caused by that work around (Closes: #494665). + * debian/collectd.init.d: + - The "status" command now exits with 1 if collectd is not running. + - Do not suppress output when checking the configuration with the -t + command line option. This will also show errors that don't cause + collectd to abort, e.g. failure to load plugins (Closes: #499232). + * debian/control: + - Added librrd-dev as the preferred option to the librrd2-dev build + dependency - the latter one is a virtual package since rrdtool 1.3. + * Added debian/patches/perl_deadlock.dpatch - upstream patch to fix a + possible deadlock in the perl plugin (Closes: #499179). + * Added debian/patches/memory_libstatgrab.dpatch - trivial upstream patch to + fix a typo in the libstatgrab code of the memory plugin. + * Added debian/patches/collectd_memleak.dpatch - trivial upstream patch to + fix a possible memory leak. + * Added debian/patches/snmp_memleak.dpatch - trivial upstream patch to fix a + possible memory leak in the snmp plugin. + * Added debian/patches/memcached_fdleak.dpatch - trivial upstream patch to + fix a possible file descriptor leak in the memcached plugin. + * Added debian/patches/memcached_timeout.dpatch - trivial upstream patch to + fix the timeout passed to poll(2). + + -- Sebastian Harl Thu, 18 Sep 2008 19:12:54 +0200 + + collectd (4.4.2-1) unstable; urgency=low + + * New upstream release. + * Removed librrd0-dev and libmysqlclient14-dev from the build-dependencies - + those package are no longer available since Etch. + * Removed byacc from the build-dependencies - collectd now requires bison. + * Removed libupsclient-config.sh - upstream now supports pkg-config for + libupsclient. + * Include collection3 in /usr/share/doc/collectd/examples/: + - Updated README.Debian to point the collection3's README. + - Added libconfig-general-perl to the suggested packages. + * README.Debian: Added a note about how to get collectd2html.pl working with + version 4 of collectd. + * Added debian/patches/myplugin_strcpy.dpatch - use sstrncpy() instead of + strcpy() which is poisoned in collectd.h. + * collectd.overrides: Removed shlib-with-non-pic-code for nut.so - the + plugin now links against the shared libupsclient. + * Do not compress any example files, so they may be used directly. + + -- Sebastian Harl 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 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 diff --cc debian/collectd.overrides index 5208c6a,574ca7f..9350ff0 --- a/debian/collectd.overrides +++ b/debian/collectd.overrides @@@ -1,5 -1,3 +1,4 @@@ +collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so - collectd: shlib-with-non-pic-code usr/lib/collectd/iptables.so collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so collectd: spelling-error-in-description mysql MySQL diff --cc debian/control index 3d68821,680c00d..d520a20 --- a/debian/control +++ b/debian/control @@@ -2,8 -2,8 +2,8 @@@ Source: collect Section: utils Priority: optional Maintainer: Sebastian Harl - Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~) -Build-Conflicts: libpthread-dev ++Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~) +Build-Conflicts: libpthread-dev, iptables-dev Standards-Version: 3.8.0 Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git