svn merge -r773:775 branches/collectd-3.9 branches/collectd-3.8

diff --cc ChangeLog
index 54049959da5339a55ac6d8d500eac27f4c1f15a5,871acf09cc2e2fbe7d331dabe714ae254cb89619..98c940162ce600afb495bc1e8d48bedc1bc2a9ae
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,11 +1,11 @@@
 -2006-06-01, Version 3.9.3
++2006-06-01, Version 3.8.6
+       * Fixed the ping-plugin under FreeBSD and Mac OS X. Potentially other
+         operating systems also profit from the changes, but I wasn't able to
+         check that.
+       * Changed the build system to find the netinet-includes under FreeBSD
+         and therefore successfully build the `liboping' library there.
+ 
 -2006-05-09, Version 3.9.2
 +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.

diff --cc collectd.spec
index 63a71d562b7d95b2dd8f69f27e5e71ca60b2d0ad,bcc1cd14b4b9f1d3a73352ffe500e02ec0ca48eb..af0ba1ce66c79b09bedfab5d0b46c9355f337224
--- 1/collectd.spec
--- 2/collectd.spec
+++ b/collectd.spec
@@@ -1,8 -1,8 +1,8 @@@
  Summary:      Statistics collection daemon for filling RRD files.
  Name:           collectd
- Version:      3.8.5
 -Version:      3.9.3
++Version:      3.8.6
  Release:      1
 -Source:               http://collectd.org/files/%{name}-%{version}.tar.gz
 +Source:               http://verplant.org/collectd/%{name}-%{version}.tar.gz
  License:      GPL
  Group:                System Environment/Daemons
  BuildRoot:    %{_tmppath}/%{name}-%{version}-root
@@@ -88,14 -101,18 +88,17 @@@ rm -rf $RPM_BUILD_ROO
  %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
  
  %changelog
 -* Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.9.3-1
++* Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.8.6-1
+ - New upstream version
+ 
 -* Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.9.2-1
 +* 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
 +* Sun Apr 09 2006 Florian octo Forster <octo@verplant.org> 3.8.4-1
  - New upstream version
  
 -* Fri Apr 14 2006 Florian octo Forster <octo@verplant.org> 3.9.0-1
 +* Sun Apr 02 2006 Florian octo Forster <octo@verplant.org> 3.8.3-1
  - New upstream version
 -- Added the `apache' package.
  
  * Thu Mar 14 2006 Florian octo Forster <octo@verplant.org> 3.8.2-1
  - New upstream version

diff --cc configure.in
index 7d8a5d6eb9f00ad974f228b8441173e88d2e8c48,3ac7fc5892540399cce9955ffd95cc6d5cd09cdf..e0ce0684b9a3f08eccfd7bd115ca35e6881295e9
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Process this file with autoconf to produce a configure script.
- AC_INIT(collectd, 3.8.5)
 -AC_INIT(collectd, 3.9.3)
++AC_INIT(collectd, 3.8.6)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)

diff --cc debian/changelog
index cb13407cf515f068b488f8f34ea598f2bacca416,eb2e4bdd4d421c67c64514d2a969118a7be48e53..fd5a9fbda2e1074495a38216c19807842250ff7e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -collectd (3.9.3) unstable; urgency=low
++collectd (3.8.6) unstable; urgency=low
+ 
+   * New upstream version 
+ 
 - -- Florian Forster <octo@leeloo.home.verplant.org>  Thu,  1 Jun 2006 22:41:55 +0200
++ -- Florian Forster <octo@leeloo.home.verplant.org>  Thu,  1 Jun 2006 23:00:08 +0200
+ 
 -collectd (3.9.2-1) unstable; urgency=low
 +collectd (3.8.5-1) unstable; urgency=low
  
    * New upstream version
  

diff --cc src/liboping/liboping.c
Simple merge