Merged branch 'master' of git://git.tokkee.org/pkg-collectd.

diff --cc debian/changelog
index d4c67ed4794554d6a6a5fed8945e59f50c5b8fc5,0a60e709a9af58709e2d3fcb6cf1b370bcf01ddd..755197e06c63249c9407545e63bf176c3640560c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,29 +1,36 @@@
+ collectd (4.7.0-1) unstable; urgency=low
+ 
+   * New upstream release.
+     New plugins:
+     - Connection tracking table size: conntrack
+     - Linux file-system based caching framework statistics: fscache
+     - Receive and interpret Ganglia multicast traffic: gmond (disabled in
+       Debian, libganglia >= 3 is required)
+     - Embedded Java Virtual Machine: java
+     - Query and parse data from a memcache daemon: memcachec (disabled in
+       Debian, libmemcached is not available)
+     - Information about network protocols: protocols
+     - Parse table-like structured files: table
+     - Power consumption measurements from "The Energy Detective" (TED): ted
+     - System uptime: uptime
+   * debian/rules:
+     - Install collectd-{network,unixsock}.py to /usr/share/doc/collectd/
+       examples/.
+     - Pass CPPFLAGS and CFLAGS as arguments to configure instead of setting
+       them in the environment - this is the recommended way.
+   * debian/patches:
+     - Removed battery_acpi_complain.dpatch - included upstream.
+     - Removed ntpd_type_pun_fix.dpatch - included upstream.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
+ 
 +collectd (4.6.2-3) unstable; urgency=low
 +
 +  * debian/patches:
 +    - Actually enabled rrdtool_uninitialized_fix.dpatch - d'oh!
 +
 + -- Sebastian Harl <tokkee@debian.org>  Fri, 29 May 2009 15:49:46 +0200
 +
  collectd (4.6.2-2) unstable; urgency=low
  
    * debian/patches:

diff --cc debian/patches/00list
index 8a227ab8b9050a54c1139eb04d860fbb073205d9,16268ce36610a2b02cb3f5db03f9528a501db3ed..0ae5976899d1d54db022d920730ac0efa12cd024
--- 1/debian/patches/00list
--- 2/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,7 -1,4 +1,5 @@@
  rrd_filter_path.dpatch
  collection_conf_path.dpatch
- battery_acpi_complain.dpatch
- ntpd_type_pun_fix.dpatch
  include_empty_files.dpatch
 +rrdtool_uninitialized_fix.dpatch