Merged branch 'lenny' into master.

diff --cc debian/changelog
index fca40549792c4ee7c00395b90f05ae6b50622f9c,3ff669955b1af30770057a2328a38ff4a0e0bfaa..8f7072a42ad5fb7f93b9b21a2cef7851e60bde9b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,18 +1,56 @@@
 +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/.
 +  * 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.
 +  * debian/collectd.overrides:
 +    - Override "spelling-error-in-description" for the postgresql plugin name
 +      all plugins are spelled lowercase.
 +
 + -- Sebastian Harl <sh@tokkee.org>  Mon, 01 Dec 2008 21:41:12 +0100
 +
+ 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 <sh@tokkee.org>  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

diff --cc debian/collectd.conf
Simple merge

diff --cc debian/copyright
index b333a6278a02d59e93f803a16f1c396d4e64274e,2c5c880e9cdbee4940356cb5b9f9da96a1420ba5..01e39ec0f4b97a793c8146e0426b2cbe70f70df5
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -31,10 -31,9 +32,11 @@@ Copyright Holders (in alphabetical orde
        Kern Sibbald
        Lubos Stanek <lubek@users.sourceforge.net>
        Lyonel Vincent <lyonel@ezix.org>
+       Martin Bagge <brother@bsnet.se>
 +      Michał Mirosław <mirq-linux@rere.qmqm.pl>
        Netfilter Core Team
        Niki W. Waibel <niki.waibel@newlogic.com>
 +      Oleg King <king2@kaluga.ru>
        Pavel Shramov <shramov@mexmat.net>
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>

diff --cc debian/patches/00list
index 12d1fc0f24ed08f51f27a9d18c8ab20e136843d5,57eb84c0a219510b09666284666e03f3d3e99c06..87f910c2d33e19ba6596d8f9fdef15844ff345d1
--- 1/debian/patches/00list
--- 2/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,4 -1,11 +1,5 @@@
  rrd_filter_path.dpatch
  collection_conf_path.dpatch
 -myplugin_strcpy.dpatch
 -memory_libstatgrab.dpatch
 -collectd_memleak.dpatch
 -snmp_memleak.dpatch
 -memcached_fdleak.dpatch
 -memcached_timeout.dpatch
 -perl_deadlock.dpatch
 +perl-uninitialized-var.dpatch
+ pod-errors.dpatch
  

diff --cc debian/rules
Simple merge