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

[Yves-Alexis Perez]

Author: corsac
Date: 2012-05-15 21:10:04 +0000 (Tue, 15 May 2012)
New Revision: 7005

Removed:
   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 removed, included upstream.

Modified: goodies/trunk/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/changelog	2012-05-15 21:08:59 UTC (rev 7004)
+++ goodies/trunk/xfce4-sensors-plugin/debian/changelog	2012-05-15 21:10:04 UTC (rev 7005)
@@ -1,6 +1,8 @@
 xfce4-sensors-plugin (1.2.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_fix-hdds-detection-linux-3.x removed, included upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 15 May 2012 23:08:50 +0200
 

Deleted: 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	2012-05-15 21:08:59 UTC (rev 7004)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-hdds-detection-linux-3.x.patch	2012-05-15 21:10:04 UTC (rev 7005)
@@ -1,18 +0,0 @@
-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>=3 || (generation==2 && major>=5)))
-         read_disks_linux26 (chip);
-     else
-         read_disks_fallback (chip); /* hopefully, that's a safe variant */

Deleted: goodies/trunk/xfce4-sensors-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/series	2012-05-15 21:08:59 UTC (rev 7004)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/series	2012-05-15 21:10:04 UTC (rev 7005)
@@ -1 +0,0 @@
-01_fix-hdds-detection-linux-3.x.patch