From 655c24d999362a2c59f659c97c2ecf25c7648d83 Mon Sep 17 00:00:00 2001 From: octo Date: Sat, 18 Feb 2006 11:46:03 +0000 Subject: [PATCH] Merged Sebastian's fix for battery.c Bumped version to 3.7.2 --- ChangeLog | 5 +++++ collectd.spec | 7 ++++++- configure.in | 2 +- debian/changelog | 8 +++++++- src/battery.c | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de5fa9eb..a2c1b3fc 100644 --- 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 bb4574db..7cccb396 100644 --- 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 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 3.7.1-1 - New upstream version diff --git a/configure.in b/configure.in index 27749e06..7781635e 100644 --- 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 3c508275..75f7fa06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +collectd (3.7.2-1) unstable; urgency=low + + * New upstream version + + -- Florian Forster Sat, 18 Feb 2006 12:36:09 +0200 + collectd (3.7.1-1) unstable; urgency=low * New upstream version - -- Florian Forster Sat, 02 Feb 2006 10:44:05 +0200 + -- Florian Forster 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 541bab3d..6c7e2b50 100644 --- 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); -- 2.30.2