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

diff --cc debian/changelog
index bcbe7eedc2119b575cc762a34348011029fa044c,755197e06c63249c9407545e63bf176c3640560c..c02aacda2fb659176eeac816b1e707b9100b97c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,28 +1,39 @@@
 -    - Install collectd-{network,unixsock}.py to /usr/share/doc/collectd/
 -      examples/.
+ 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-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.
++
++ -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
++
 +collectd (4.6.3-1) unstable; urgency=low
 +
 +  * New upstream release.
    * debian/patches:
      - Removed battery_acpi_complain.dpatch - included upstream.
 +    - Removed include_empty_files.dpatch - included upstream.
      - Removed ntpd_type_pun_fix.dpatch - included upstream.
 +    - Removed rrdtool_uninitialized_fix.dpatch - included upstream.
 +    - Added libcollectdclient_static_sstrerror.dpatch to make a private
 +      function in libcollectdclient static.
 +  * debian/rules:
 +    - Install collectd-network.py to /usr/share/doc/collectd/examples/.
  
 - -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
 + -- Sebastian Harl <tokkee@debian.org>  Tue, 02 Jun 2009 22:03:10 +0200
  
  collectd (4.6.2-3) unstable; urgency=low
  

diff --cc debian/copyright
Simple merge