Hi, I just uploaded xfce4-sensors-plugin 0.10.99.5~svn-r4998-2 to unstable and would like to request a freeze exception. It fixes two bugs, which I guess are not RC, but are still painful:
* fan state is not detected correctly and leads to crash the plugin (#491480) * battery info aren't looked at the good place, so it always reports 0mWh The debdiff (dsc) is attached. Cheers, and thanks -- Yves-Alexis
diff -u xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/changelog xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/changelog --- xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/changelog +++ xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/changelog @@ -1,3 +1,17 @@ +xfce4-sensors-plugin (0.10.99.5~svn-r4998-2) unstable; urgency=low + + [ Stefan Ott ] + * debian/control: update e-mail address + + [ Yves-Alexis Perez ] + * debian/patches: + - 01_fix-acpi-fan-infos added, don't crash plugin when refreshing fan + state. Thanks Daniel Gibson for debugging this and cooking the patch. + closes: #491480 + - 02_fix-acpi-battery-path added, don't add twice “battery” in path. + + -- Yves-Alexis Perez <[EMAIL PROTECTED]> Wed, 06 Aug 2008 08:27:55 +0200 + xfce4-sensors-plugin (0.10.99.5~svn-r4998-1) unstable; urgency=low * New upstream svn snapshot. diff -u xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/control xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/control --- xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/control +++ xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/control @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Debian Xfce Maintainers <[EMAIL PROTECTED]> -Uploaders: Emanuele Rocca <[EMAIL PROTECTED]>, Simon Huggins <[EMAIL PROTECTED]>, Rudy Godoy <[EMAIL PROTECTED]>, Yves-Alexis Perez <[EMAIL PROTECTED]>, Stefan Ott <[EMAIL PROTECTED]> +Uploaders: Emanuele Rocca <[EMAIL PROTECTED]>, Simon Huggins <[EMAIL PROTECTED]>, Rudy Godoy <[EMAIL PROTECTED]>, Yves-Alexis Perez <[EMAIL PROTECTED]>, Stefan Ott <[EMAIL PROTECTED]> Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, xfce4-panel-dev (>= 4.4.1), libxml2-dev, libsensors4-dev, libxml-parser-perl, hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386] Standards-Version: 3.8.0 Homepage: http://goodies.xfce.org/ only in patch2: unchanged: --- xfce4-sensors-plugin-0.10.99.5~svn-r4998.orig/debian/patches/01_fix-acpi-fan-infos.patch +++ xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/patches/01_fix-acpi-fan-infos.patch @@ -0,0 +1,32 @@ +--- xfce4-sensors-plugin-0.10.99.5.orig/panel-plugin/acpi.c 2008-08-06 01:56:00.063518101 +0200 ++++ xfce4-sensors-plugin-0.10.99.5/panel-plugin/acpi.c 2008-08-06 03:11:08.635447284 +0200 +@@ -445,7 +445,7 @@ + void + refresh_acpi (gpointer chip_feature, gpointer data) + { +- char *file, *zone; ++ char *file, *zone, *state; + t_chipfeature *cf; + + TRACE ("enters refresh_acpi"); +@@ -472,8 +472,18 @@ + break; + + case STATE: +- file = g_strdup_printf ("%s/%s/state", ACPI_DIR_FAN, cf->devicename); +- cf->raw_value = strcmp(get_acpi_value(file), "on")==0 ? 1.0 : 0.0; ++ // get_acpi_value() expects a _full_ path (unlike get_acpi_zone_value() etc)! ++ file = g_strdup_printf ("%s/%s/%s/state", ACPI_PATH, ACPI_DIR_FAN, cf->devicename); ++ state = get_acpi_value(file); ++ // if get_acpi_value has returned NULL (=> the file hasn't been found) ++ // we display the fan as "off" ++ if(state==NULL){ ++ DBG("get_acpi_value has returned NULL!"); ++ cf->raw_value = 0.0; ++ break; ++ } ++ // on my box there is a \n after "on".. dunno if that's normal, so i only compare 2 chars ++ cf->raw_value = strncmp(state, "on", 2)==0 ? 1.0 : 0.0; + g_free (file); + /* g_free (cf->formatted_value); + cf->formatted_value = g_strdup_printf (_("%.0f"), cf->raw_value); */ only in patch2: unchanged: --- xfce4-sensors-plugin-0.10.99.5~svn-r4998.orig/debian/patches/02_fix-acpi-battery-path.patch +++ xfce4-sensors-plugin-0.10.99.5~svn-r4998/debian/patches/02_fix-acpi-battery-path.patch @@ -0,0 +1,15 @@ +diff --git a/panel-plugin/acpi.c b/panel-plugin/acpi.c +index 5f3ab4a..49b20bc 100644 +--- a/panel-plugin/acpi.c ++++ b/panel-plugin/acpi.c +@@ -464,9 +464,7 @@ refresh_acpi (gpointer chip_feature, gpointer data) + break; + + case ENERGY: +- zone = g_strdup_printf ("%s/%s", ACPI_DIR_BATTERY, cf->devicename); +- cf->raw_value = get_battery_zone_value (zone); +- g_free (zone); ++ cf->raw_value = get_battery_zone_value (cf->devicename); + /* g_free (cf->formatted_value); + cf->formatted_value = g_strdup_printf (_("%.0f mWh"), cf->raw_value); */ + break;
signature.asc
Description: This is a digitally signed message part
