diff -Nru psensor-0.6.2.16/debian/changelog psensor-0.6.2.16/debian/changelog --- psensor-0.6.2.16/debian/changelog 2012-01-22 17:05:58.000000000 +0100 +++ psensor-0.6.2.16/debian/changelog 2012-03-30 09:15:01.000000000 +0200 @@ -1,3 +1,10 @@ +psensor (0.6.2.16-1ubuntu4) precise; urgency=low + + * debian/patches/LP968912.patch + - fixed displayed sensor type. (Closes: #968912) + + -- Jean-Philippe Orsini Fri, 30 Mar 2012 09:07:58 +0200 + psensor (0.6.2.16-1ubuntu3) precise; urgency=low * debian/control diff -Nru psensor-0.6.2.16/debian/patches/LP968912.patch psensor-0.6.2.16/debian/patches/LP968912.patch --- psensor-0.6.2.16/debian/patches/LP968912.patch 1970-01-01 01:00:00.000000000 +0100 +++ psensor-0.6.2.16/debian/patches/LP968912.patch 2012-03-30 09:07:17.000000000 +0200 @@ -0,0 +1,55 @@ +Index: psensor-0.6.2.16/src/lib/psensor.c +=================================================================== +--- psensor-0.6.2.16.orig/src/lib/psensor.c 2011-12-23 02:53:29.000000000 +0100 ++++ psensor-0.6.2.16/src/lib/psensor.c 2012-03-30 09:07:09.894586637 +0200 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2010-2011 jeanfi@gmail.com ++ * Copyright (C) 2010-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as +@@ -396,30 +396,30 @@ + + const char *psensor_type_to_str(unsigned int type) + { +- if (type & SENSOR_TYPE_REMOTE) +- return "Remote"; +- +- if (type & SENSOR_TYPE_LMSENSOR_TEMP) +- return "Temperature"; +- +- if (type & SENSOR_TYPE_LMSENSOR_FAN) +- return "Fan"; +- +- if (type & SENSOR_TYPE_NVIDIA_TEMP) ++ if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP) + return "NVidia GPU Temperature"; + +- if (type & SENSOR_TYPE_AMD_TEMP) ++ if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP) + return "AMD GPU Temperature"; + +- if (type & SENSOR_TYPE_AMD_FAN) ++ if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN) + return "AMD GPU Fan Speed"; + +- if (type & SENSOR_TYPE_HDD_TEMP) ++ if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP) + return "HDD Temperature"; + + if (type & SENSOR_TYPE_CPU_USAGE) + return "CPU Usage"; + ++ if (type & SENSOR_TYPE_TEMP) ++ return "Temperature"; ++ ++ if (type & SENSOR_TYPE_FAN) ++ return "Fan"; ++ ++ if (type & SENSOR_TYPE_REMOTE) ++ return "Remote"; ++ + return "N/A"; /* should not be possible */ + } + diff -Nru psensor-0.6.2.16/debian/patches/series psensor-0.6.2.16/debian/patches/series --- psensor-0.6.2.16/debian/patches/series 2012-01-22 05:41:27.000000000 +0100 +++ psensor-0.6.2.16/debian/patches/series 2012-03-30 09:05:20.000000000 +0200 @@ -1 +1,2 @@ drop_g_thread_init.patch +LP968912.patch