[Pkg-xfce-commits] r1325 - in goodies/xfce4-battery-plugin/debian: . patches

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-07-19 06:50:55 +0000 (Thu, 19 Jul 2007)
New Revision: 1325

Added:
   goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch
Modified:
   goodies/xfce4-battery-plugin/debian/changelog
Log:
fix battery plugin on 2.6.21 kernels


Modified: goodies/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/xfce4-battery-plugin/debian/changelog	2007-07-18 18:36:01 UTC (rev 1324)
+++ goodies/xfce4-battery-plugin/debian/changelog	2007-07-19 06:50:55 UTC (rev 1325)
@@ -1,3 +1,10 @@
+xfce4-battery-plugin (0.5.0-2) UNRELEASED; urgency=low
+
+  * debian/patches: added 02_fix-2.6.21.patch which fix battery plugin on
+    2.6.21 kernels and over.                                    closes: #409971 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 19 Jul 2007 08:49:31 +0200
+
 xfce4-battery-plugin (0.5.0-1) unstable; urgency=low
 
   (Yves-Alexis Perez)

Added: goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch	                        (rev 0)
+++ goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch	2007-07-19 06:50:55 UTC (rev 1325)
@@ -0,0 +1,16 @@
+diff -Nru xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c
+--- xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c	2007-04-29 15:08:23.670477251 +0000
++++ xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c	2007-04-29 15:17:23.213224040 +0000
+@@ -207,10 +207,10 @@
+ #ifdef __linux__
+   FILE *acpi;
+ 
+-  if (!(acpi = fopen ("/proc/acpi/info", "r")))
++  if ( (!(acpi = fopen ("/proc/acpi/info", "r"))) && (!(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r"))) )
+   {
+ #ifdef DEBUG
+-	  printf("DBG:no acpi: /proc/acpi/info not found!\n");
++	  printf("DBG:no acpi: /proc/acpi/info and /sys/module/acpi/parameters/acpica_version not found!\n");
+ #endif
+     return 1;
+   }