Merged changelog entries from versions 3.8.5 and 3.9.1

diff --git a/ChangeLog b/ChangeLog
index 3bcad3f..a60bce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
        * The `traffic' plugin can now ignore certain interfaces. Also,
          statistics for sent/received packets and errors have been added.
 
+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.

diff --git a/collectd.spec b/collectd.spec
index 9918b8f..8c4854e 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -101,6 +101,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* 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
+
 * Fri Apr 14 2006 Florian octo Forster <octo@verplant.org> 3.9.0-1
 - New upstream version
 - Added the `apache' package.

diff --git a/debian/changelog b/debian/changelog
index 1ad1f21..8c1be96 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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
+
+ -- Florian Forster <octo@verplant.org>  Fri, 21 Apr 2006 17:38:08 +0200
+
 collectd (3.9.0-1) unstable; urgency=low
 
   * New upstream version