[Pkg-xfce-commits] r6271 - in goodies/trunk/xfce4-sensors-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-12-21 19:06:45 +0000 (Wed, 21 Dec 2011)
New Revision: 6271

Added:
   goodies/trunk/xfce4-sensors-plugin/debian/patches/
   goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-hdds-detection-linux-3.x.patch
   goodies/trunk/xfce4-sensors-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-sensors-plugin/debian/changelog
Log:
* debian/patches:
  - 01_fix-hdds-detection-linux-3.x.patch: fix incorrect test with linux
    3.x.                                                      closes: #640052

Modified: goodies/trunk/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-12-20 16:08:51 UTC (rev 6270)
+++ goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-12-21 19:06:45 UTC (rev 6271)
@@ -1,3 +1,11 @@
+xfce4-sensors-plugin (1.2.3-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-hdds-detection-linux-3.x.patch: fix incorrect test with linux
+      3.x.                                                      closes: #640052
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 21 Dec 2011 19:30:58 +0100
+
 xfce4-sensors-plugin (1.2.3-1) unstable; urgency=low
 
   * New upstream release.

Added: goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-hdds-detection-linux-3.x.patch
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-hdds-detection-linux-3.x.patch	                        (rev 0)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-hdds-detection-linux-3.x.patch	2011-12-21 19:06:45 UTC (rev 6271)
@@ -0,0 +1,18 @@
+Description: Fix linux kernel detection
+ X.Y.Z versions with Y < 5 are considered as pre-2.6 kernels and use a 
+ different interface to find HDDs. Obviously this fails with linux 3.0.0.
+Author: Lionel Le Folgoc <lionel at lefolgoc.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640052
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8266
+
+--- xfce4-sensors-plugin-1.2.3.orig/lib/hddtemp.c
++++ xfce4-sensors-plugin-1.2.3/lib/hddtemp.c
+@@ -421,7 +421,7 @@ initialize_hddtemp (GPtrArray *chips, gb
+ #ifdef HAVE_NETCAT
+     read_disks_netcat (chip);
+ #else
+-    if (strcmp(p_uname->sysname, "Linux")==0 && major>=5)
++    if (strcmp(p_uname->sysname, "Linux")==0 && (generation>=2 || (generation==2 && major>=5)))
+         read_disks_linux26 (chip);
+     else
+         read_disks_fallback (chip); /* hopefully, that's a safe variant */

Added: goodies/trunk/xfce4-sensors-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/series	2011-12-21 19:06:45 UTC (rev 6271)
@@ -0,0 +1 @@
+01_fix-hdds-detection-linux-3.x.patch