Merge branches 'master' and 'debian' into release
diff --git a/debian/changelog b/debian/changelog
index 1aecbca..533609e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+powerdebug (0.6.1-2011.11-0) natty; urgency=low
+
+ * fixed lp: 857382
+
+ -- Daniel Lezcano <daniel.lezcano@linaro.org> Thu, 20 Oct 2011 14:36:19 +0200
+
powerdebug (0.6.0-2011.09-0) natty; urgency=low
* added gpio support
diff --git a/powerdebug.h b/powerdebug.h
index 39a7b31..09d3c1e 100644
--- a/powerdebug.h
+++ b/powerdebug.h
@@ -13,4 +13,4 @@
* - initial API and implementation
*******************************************************************************/
-#define VERSION "0.6.0"
+#define VERSION "0.6.1"
diff --git a/sensor.c b/sensor.c
index ff1e3dd..bd8c354 100644
--- a/sensor.c
+++ b/sensor.c
@@ -61,7 +61,7 @@
printf("%s\n", sensor->name);
for (i = 0; i < sensor->nrtemps; i++)
- printf(" %s %.1f °C\n", sensor->temperatures[i].name,
+ printf(" %s %.1f °C/V\n", sensor->temperatures[i].name,
(float)sensor->temperatures[i].temp / 1000);
for (i = 0; i < sensor->nrfans; i++)
@@ -219,7 +219,7 @@
(*line)++;
for (i = 0; i < sensor->nrtemps; i++) {
- sprintf(buf, " %-35s%.1f °C", sensor->temperatures[i].name,
+ sprintf(buf, " %-35s%.1f", sensor->temperatures[i].name,
(float)sensor->temperatures[i].temp / 1000);
display_print_line(SENSOR, *line, buf, 0, t);
(*line)++;