Merged stuff from branches/collectd-3.9: After release 3.9.2 the ChangeLog additions...

diff --combined ChangeLog
index a60bce1,6a5f3ea..326926c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +      * 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.
 +
+ 2006-05-09, Version 3.9.2
+       * 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-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.
@@@ -15,7 -10,7 +20,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 configure.in
index 54c144b,315e28d..d13689e
--- 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.9.0)
+ AC_INIT(collectd, 3.9.2)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -174,10 -174,6 +174,10 @@@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSource
  ])
  AC_CHECK_HEADERS(IOKit/ps/IOPSKeys.h)
  
 +# For the `disk' plugin
 +AC_CHECK_HEADERS(IOKit/IOBSD.h)
 +AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h)
 +
  # For load module
  AC_CHECK_HEADERS(sys/loadavg.h)
  
@@@ -373,7 -369,7 +373,7 @@@ if test "x$fu_cv_getmntent2" = "xyes"; 
  fi
  
  # Check for structures
 -AC_CHECK_MEMBERS([struct if_data.ifi_ibytes, struct if_data.ifi_obytes],
 +AC_CHECK_MEMBERS([struct if_data.ifi_ibytes, struct if_data.ifi_opackets, struct if_data.ifi_ierrors],
        [AC_DEFINE(HAVE_STRUCT_IF_DATA, 1, [Define if struct if_data exists and is usable.])],
        [],
        [
@@@ -381,7 -377,7 +381,7 @@@
        #include <sys/socket.h>
        #include <net/if.h>
        ])
 -AC_CHECK_MEMBERS([struct net_device_stats.rx_bytes, struct net_device_stats.tx_bytes],
 +AC_CHECK_MEMBERS([struct net_device_stats.rx_bytes, struct net_device_stats.tx_packets, struct net_device_stats.rx_errors],
        [AC_DEFINE(HAVE_STRUCT_NET_DEVICE_STATS, 1, [Define if struct net_device_stats exists and is usable.])],
        [],
        [
@@@ -587,9 -583,6 +587,9 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin
  AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library])
  AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes")
  
 +with_libstatgrab="yes"
 +with_libdevstat="no"
 +with_libkvm="no"
  AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
  [
        if test "x$withval" != "xno" -a "x$withval" != "xyes"
@@@ -609,7 -602,9 +609,7 @@@
  ])
  if test "x$with_libstatgrab" = "xyes"
  then
 -      AC_CHECK_LIB(devstat, getdevs)
 -      AC_CHECK_LIB(kvm, kvm_getargv)
 -      AC_CHECK_LIB(statgrab, sg_init,, [with_libstatgrab="no (libstatgrab not found)"])
 +      AC_CHECK_LIB(statgrab, sg_init, [with_libstatgrab="yes"], [with_libstatgrab="no (libstatgrab not found)"])
  fi
  if test "x$with_libstatgrab" = "xyes"
  then
@@@ -617,11 -612,6 +617,11 @@@
  fi
  if test "x$with_libstatgrab" = "xyes"
  then
 +      AC_CHECK_LIB(devstat, getdevs, [with_libdevstat="yes"], [with_libdevstat="no"])
 +      AC_CHECK_LIB(kvm, kvm_getargv, [with_libkvm="yes"],     [with_libkvm="no"])
 +fi
 +if test "x$with_libstatgrab" = "xyes"
 +then
        collect_libstatgrab=1
  else
        collect_libstatgrab=0
@@@ -629,8 -619,6 +629,8 @@@ f
  AC_DEFINE_UNQUOTED(COLLECT_LIBSTATGRAB, [$collect_libstatgrab],
        [Wether or not to use statgrab library])
  AM_CONDITIONAL(BUILD_WITH_LIBSTATGRAB, test "x$with_libstatgrab" = "xyes")
 +AM_CONDITIONAL(BUILD_WITH_LIBDEVSTAT,  test "x$with_libdevstat"  = "xyes")
 +AM_CONDITIONAL(BUILD_WITH_LIBKVM,      test "x$with_libkvm"      = "xyes")
  
  AC_ARG_WITH(lm-sensors, [AS_HELP_STRING([--with-lm-sensors@<:@=PREFIX@:>@], [Path to lm_sensors.])],
  [

diff --combined debian/changelog
index 8c1be96,38cab46..d346c73
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ collectd (3.9.2-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- 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