Merged commit 'collectd-4.4.1-2' into etch-backports.

diff --cc debian/changelog
index ad7adbf502ec1e20b021c4ba3eab46c2294c8080,64520682948089e119490672d7c7d6ffb452138f..717b0b7ce8df08632feac7f4ac3625dd651d36cc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,50 +1,63 @@@
+ collectd (4.4.1-2) unstable; urgency=low
+ 
+   * Restrict libcurl4-gnutls-dev build dependency to versions which are not
+     affected by #488701 (Closes: #489091).
+   * Added linux-libc-dev (<< 2.6.25-1) as an option to the linux-libc-dev
+     (>= 2.6.25-4) build dependency - those versions are not affected by
+     #479899.
+   * Added build dependency on pkg-config - this is used by collectd's
+     configure script to check for a couple of libraries.
+   * Added libupsclient-config.sh to imitate libupsclient-config which is no
+     longer available. libupsclient-config.sh is a simple wrapper around
+     pkg-config. This is a workaround until upstream supports pkg-config for
+     libupsclient.
+   * Replaced nut-dev build dependency with libupsclient1-dev:
+     Reenabled the "nut" plugin on all architectures.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Mon, 07 Jul 2008 20:45:53 +0000
+ 
+ collectd (4.4.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+     - Fixed another issue of the sensors plugin affecting some chip types
+       (Closes: #468143).
+     - Fixed creation of "vserver" graphs in collection.cgi (Closes: #475120).
+     - Fixed a segfault when using libperl 5.10.
+     - collectd now ships libiptc itself.
+     New plugins:
+     - Ascent server statistics: ascent
+     - IPMI sensors information: ipmi
+     - PowerDNS name server statistics: powerdns
+     - incremental parsing of logfiles: tail
+     - TeamSpeak2 server statistics: teamspeak2
+     - detailed virtual memory statistics: vmem
+   * Disable "tcpconns" plugin by default (Closes: #478759).
+   * Reenabled iptables plugin on all architectures (Closes: #473435).
+     - Added the plugin to collectd.conf.
+     - Added /usr/share/doc/collectd/examples/iptables/.
+     - Added build dependency on linux-libc-dev (>= 2.6.25-4) - that version is
+       required because of #479899.
+   * New debconf template translations:
+     - gl.po, thanks to Jacobo Tarrio (Closes: #482667).
+   * Added a work around for #474087 (broken openipmi .pc files) by forcing the
+     inclusion of the ipmi plugin and manually specifying the dependencies.
+   * Updated standards-version to 3.8.0 (no changes).
+ 
+  -- 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.

diff --cc debian/control
index aebf6dc6d77c62502fb748832f118eae0699800a,ea5738ee69ca135855255e533125cd42165440f8..e2adb00dd08653969e1cf813b767b16a7f8b3bc4
--- 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 | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev
 -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, 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 | libmysqlclient14-dev, librrd2-dev | librrd0-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
++Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
  Build-Conflicts: libpthread-dev
- Standards-Version: 3.7.3
+ Standards-Version: 3.8.0
  Homepage: http://collectd.org/
  Vcs-Git: git://git.tokkee.org/pkg-collectd.git
  Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git