Merge branch 'collectd-3.9'

diff --combined ChangeLog
index 0e3c7a7,bfca172..0a181fe
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,4 +1,14 @@@
- 2006-06-18, Version 3.9.4
 +      * The `disk' plugin has been ported to Darwin.
 +      * The `battery' plugin should work on many Apple computers now.
 +      * The `traffic' plugin can now ignore certain interfaces. Also,
 +        statistics for sent/received packets and errors have been added.
 +      * A plugin to monitor APC UPSes using `apcupsd' has been added. Thanks
 +        to Anthony Gialluca for contributing this plugin and providing me
 +        with a test environment :)
 +      * A plugin for moniroting an NTP instance and the local clock drift
 +        has been added.
 +
+ 2006-06-25, Version 3.9.4
        * The Solaris code in the `swap' plugin has been changed to reflect
          the numbers returned by `swap -s'. Thanks to Christophe Kalt for
          working this out.
@@@ -28,11 -18,6 +28,11 @@@
          sequence checking the `ping' plugin stopped working after
          approximately 7.6 days.
  
 +2006-05-09, Version 3.8.5
 +      * Applied a patch to the `liboping' library. Due to a bug in the
 +        sequence checking the `ping' plugin stopped working after
 +        approximately 7.6 days.
 +
  2006-04-21, Version 3.9.1
        * Build issues with Solaris and possible other architectures have been
          resolved.
@@@ -40,7 -25,7 +40,7 @@@
          been resolved.
        * A bug in the `ping' plugin has been fixed. Sorry folks.
  
 -2006-04-15, Version 3.9.0
 +2006-04-02, Version 3.9.0
        * A plugin to monitor the Apache webserver has been added.
          <http://httpd.apache.org/>
        * A plugin to collect statistics about virtual servers using VServer.

diff --combined collectd.spec
index aea8a3f,1b18089..fe6430a
--- 1/collectd.spec
--- 2/collectd.spec
+++ b/collectd.spec
@@@ -71,7 -71,6 +71,7 @@@ rm -rf $RPM_BUILD_ROO
  %attr(0444,root,root) %{_mandir}/man1/*
  %attr(0444,root,root) %{_mandir}/man5/*
  %attr(0444,root,root) %{_libdir}/%{name}/apple_sensors.so*
 +%attr(0444,root,root) %{_libdir}/%{name}/apcups.so*
  %attr(0444,root,root) %{_libdir}/%{name}/battery.so*
  %attr(0444,root,root) %{_libdir}/%{name}/cpu.so*
  %attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so*
@@@ -102,7 -101,7 +102,7 @@@
  %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
  
  %changelog
- * Tue Jun 18 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
+ * Tue Jun 25 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
  - New upstream version
  
  * Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.9.3-1
@@@ -111,9 -110,6 +111,9 @@@
  * Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.9.2-1
  - New upstream version
  
 +* Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.8.5-1
 +- New upstream version
 +
  * Fri Apr 21 2006 Florian octo Forster <octo@verplant.org> 3.9.1-1
  - New upstream version
  

diff --combined debian/changelog
index 4e5bd89,c9a5bff..fb3e5c7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -2,7 -2,7 +2,7 @@@ collectd (3.9.4) unstable; urgency=lo
  
    * New upstream version 
  
-  -- Florian Forster <octo@leeloo.home.verplant.org>  Sun, 18 Jun 2006 19:50:44 +0200
+  -- Florian Forster <octo@leeloo.home.verplant.org>  Sun, 25 Jun 2006 19:50:44 +0200
  
  collectd (3.9.3) unstable; urgency=low
  
@@@ -16,12 -16,6 +16,12 @@@ collectd (3.9.2-1) unstable; urgency=lo
  
   -- Florian Forster <octo@verplant.org>  Tue,  9 May 2006 11:12:00 +0200
  
 +collectd (3.8.5-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Florian Forster <octo@verplant.org>  Tue,  9 May 2006 10:56:00 +0200
 +
  collectd (3.9.1-1) unstable; urgency=low
  
    * New upstream version