Merge commit 'collectd-4.6.2-1' into etch-backports.

diff --cc debian/changelog
index af07aeae503195db93c78c0056f4dc732a98b075,248cb5572de000b25d02dc4592acdc64ec0dd53e..cdfcf73c30858d04718afa8dd51aa4e3e9fb7e33
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,104 +1,123 @@@
+ collectd (4.6.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+     - Fixed the use of struct in6_addr (Closes: #521748).
+     - Added a filter infrastructure based on "matches" and "targets".
+     - Added support for vmem graphs to collection.cgi (Closes: #521993).
+     New plugins:
+     - bind9 name-server and zone statistics: bind
+     - Parse statistics from websites: curl
+     - Query data from a relational database: dbi
+     - OpenVPN traffic and compression statistics: openvpn
+     - Query data from an Oracle database: oracle (disabled in Debian,
+       libclntsh is not available)
+     - Write data via the RRD accelerator daemon: rrdcached (disabled in
+       Debian, rrdclient support is not yet available)
+     New matches:
+     - Match values by their identifier based on regular expressions: regex
+     - Match values with an invalid timestamp: timediff
+     - Select values by their data sources' values: value
+     New targets:
+     - Create and dispatch a notification: notification
+     - Replace parts of an identifier using regular expressions: replace
+     - Set (overwrite) entire parts of an identifier: set
+   * Uploading to unstable, since Lenny has been released.
+   * New debconf template translations:
+     - vi.po, thanks to Clytie Siddall (Closes: #515872).
+     - es.po, thanks to Francisco Javier Cuadrado and Erika Chacón Vivas
+       (Closes: #520988).
+   * debian/patches:
+     - Removed perl-uninitialized-var.dpatch - included upstream.
+   * debian/control:
+     - Added new binary packages libcollectdclient0 and libcollectdclient-dev
+       for the newly added client library.
+     - Added new binary package collectd-utils for optional utilities that pull
+       in additional dependencies. Currently, this only includes
+       collectd-nagios. The new package replaces collectd (<< 4.6.1-1~),
+       because it overwrites /usr/bin/collectd-nagios.
+     - Added libdbi0-dev to the build dependencies - this is required by the
+       dbi plugin.
+     - Moved collectd-dbg from section "utils" to the newly added "debug".
+     - Updated Standards-Version to 3.8.1.
+   * debian/rules:
+     - Use dh_install and *.install files to specify which package some file
+       belongs to.
+   * debian/libcollectdclient0.symbols:
+     - Added symbols file for libcollectdclient.
+   * debian/collectd.overrides:
+     - Override "spelling-error-in-description" for the apache plugin name -
+       all plugins are spelled lowercase.
+   * debian/collectd.init.d:
+     - Start the daemon using start-stop-daemon's --oknodo option to exit
+       successfully if the daemon is already running as requested by section
+       9.3.2 of the Debian Policy 3.8.1.
+   * debian/copyright:
+     - Reference GPL-2 in addition to GPL (latest version), since GPL2-only is
+       used by some files.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Thu, 02 Apr 2009 16:38:57 +0200
+ 
+ collectd (4.5.1-1) experimental; urgency=low
+ 
+   * New upstream release.
+     New plugins:
+     - Count the number of files in directories: filecount
+     - Send desktop notifications to a notification daemon: notify_desktop
+     - Send notification E-mails: notify_email
+     - One-wire sensors information: onewire (experimental, disabled in Debian)
+     - PostgreSQL database statistics: postgresql
+     - Linux ACPI thermal zone information: thermal (Closes: #492580)
+   * Uploading to experimental because of the Lenny freeze.
+   * debian/control:
+     - Added build dependency on libglib2.0-dev and libnotify-dev required by
+       the notify_desktop plugin.
+     - Added build dependency on libesmtp-dev required by the notify_email
+       plugin.
+     - Added build dependency on libpq-dev required by the postgresql plugin.
+     - Let collectd-dbg and collectd-dev depend on ${misc:Depends} - this is
+       required when using debhelper.
+   * debian/rules:
+     - Disabled onewire plugin - owfs is not yet available in Debian.
+     - Install contrib/snmp-probe-host.px to /usr/share/doc/collectd/examples/.
+     - Set CONFIGFILE to /etc/collectd/collectd.conf.
+   * debian/patches:
+     - Added perl-uninitialized-var.dpatch - upstream patch to fix an
+       uninitialized variable warning causing a FTBFS because of -Werror.
+     - Removed myplugin_strcpy.dpatch - applied upstream.
+     - Removed perl_deadlock.dpatch - included upstream.
+     - Removed memory_libstatgrab.dpatch - included upstream.
+     - Removed collectd_memleak.dpatch - included upstream.
+     - Removed snmp_memleak.dpatch - included upstream.
+     - Removed memcached_fdleak.dpatch - included upstream.
+     - Removed memcached_timeout.dpatch - included upstream.
+     - Removed pod-errors.dpatch - included upstream.
+   * debian/collectd.overrides:
+     - Override "spelling-error-in-description" for the postgresql plugin name
+       - all plugins are spelled lowercase.
+   * debian/collectd.init.d:
+     - Do not restart collectd if the configuration test fails.
+ 
+  -- 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:

diff --cc debian/collectd.overrides
index 9350ff0865b305d7b97370fff09c1ec7e56d2c05,669147c9e657a6d2d43e9148fbf56fb3f8ed2a76..f58958ce6f85703bca42645eb98ecfdddb815fa6
--- 1/debian/collectd.overrides
--- 2/debian/collectd.overrides
+++ b/debian/collectd.overrides
@@@ -1,4 -1,5 +1,6 @@@
 +collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so
  collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so
+ collectd: spelling-error-in-description apache Apache
  collectd: spelling-error-in-description mysql MySQL
+ collectd: spelling-error-in-description postgresql PostgreSQL
  

diff --cc debian/control
index 189224c1554f7c66907e79d36eef4348fc647935,15494b9ee72c0a41592ecd15ba0bb4a6d540f737..d979cc5f55c5fccae1d7d86ec504292edff6e4c3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,9 -2,9 +2,9 @@@ Source: collect
  Section: utils
  Priority: optional
  Maintainer: Sebastian Harl <sh@tokkee.org>
- Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-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
 -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~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev
 -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, 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, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev
 +Build-Conflicts: libpthread-dev, iptables-dev
- Standards-Version: 3.8.0
+ Standards-Version: 3.8.1
  Homepage: http://collectd.org/
  Vcs-Git: git://git.tokkee.org/pkg-collectd.git
  Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git

diff --cc debian/rules
Simple merge