Merged Sebastian's fix for battery.c

Bumped version to 3.7.2

diff --git a/ChangeLog b/ChangeLog
index de5fa9ebdd8c77e1caedc3c7340531478918f397..a2c1b3fcb44d9d5b99482e376c45fef0dd0eb20b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-18, Version 3.7.2
+       * A simple bug in the `battery' plugin has been fixed. It should now
+         work with ACPI based batteries as well. Thankt to Sebastian for
+         fixing this.
+
 2006-02-04, Version 3.7.1
        * The new network code has been improved to build with older versions
          of glibc.

diff --git a/collectd.spec b/collectd.spec
index bb4574db4fb627c47b0fd2458738ddb78709bd77..7cccb396da70cb69d4b11d9a3848afdbb75bc863 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary:       Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:       3.7.1
+Version:       3.7.2
 Release:       1
 Source:                http://verplant.org/collectd/%{name}-%{version}.tar.gz
 License:       GPL
@@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/processes.so*
 %attr(0444,root,root) %{_libdir}/%{name}/serial.so*
 %attr(0444,root,root) %{_libdir}/%{name}/swap.so*
+%attr(0444,root,root) %{_libdir}/%{name}/tape.so*
 %attr(0444,root,root) %{_libdir}/%{name}/traffic.so*
 %attr(0444,root,root) %{_libdir}/%{name}/users.so*
 %dir /var/lib/collectd
@@ -87,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Sat Feb 18 2006 Florian octo Forster <octo@verplant.org> 3.7.2-1
+- Include `tape.so' so the build doesn't terminate because of missing files..
+- New upstream version
+
 * Sat Feb 04 2006 Florian octo Forster <octo@verplant.org> 3.7.1-1
 - New upstream version
 

diff --git a/configure.in b/configure.in
index 27749e0645ea371536058873b9bcdf17accaff2f..7781635ef5be1a141740bfa7a117c6f54fd14157 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.7.1)
+AC_INIT(collectd, 3.7.2)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)

diff --git a/debian/changelog b/debian/changelog
index 3c508275cb5ef2b444dcbbd9e720b7f4d31863bd..75f7fa062ea8e73d1496e0d968e54c951cc158e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+collectd (3.7.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Sat, 18 Feb 2006 12:36:09 +0200
+
 collectd (3.7.1-1) unstable; urgency=low
 
   * New upstream version
 
- -- Florian Forster <octo@verplant.org>  Sat, 02 Feb 2006 10:44:05 +0200
+ -- Florian Forster <octo@verplant.org>  Sat, 04 Feb 2006 10:44:05 +0200
 
 collectd (3.7.0-1) unstable; urgency=low
 

diff --git a/src/battery.c b/src/battery.c
index 541bab3d09a6d203f43bf6e8d2ddf2be2124a71b..6c7e2b50d6d17b4e6e77be41d71fc04ff24d911b 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
@@ -278,7 +278,7 @@ static void battery_read (void)
                         * [11:00] <@tokkee> remaining capacity:      4136 mAh
                         * [11:00] <@tokkee> present voltage:         12428 mV
                         */
-                       while (fgets (buffer, BUFSIZE, fh) == NULL)
+                       while (fgets (buffer, BUFSIZE, fh) != NULL)
                        {
                                numfields = strsplit (buffer, fields, 8);