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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-10 18:26:10 +0000 (Sun, 10 Apr 2011)
New Revision: 5354

Added:
   goodies/trunk/xfce4-battery-plugin/debian/patches/0001-Show-time-when-on-battery-power-bug-3736.patch
   goodies/trunk/xfce4-battery-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-battery-plugin/debian/changelog
   goodies/trunk/xfce4-battery-plugin/debian/control
Log:
* debian/patches:
  - 0001-Show-time-when-on-battery-power-bug-3736.patch: show time estimate
    with recent kernels (sysfs attribute change post 2.6.30). Closes: #614280
  - series: add this patch.
* debian/control: add myself to Uploaders.

Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog	2011-04-06 19:44:37 UTC (rev 5353)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog	2011-04-10 18:26:10 UTC (rev 5354)
@@ -1,9 +1,17 @@
 xfce4-battery-plugin (1.0.0-2) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * Upload to unstable.
   * debian/control:
     - remove Emanuele and Simon from uploaders, thanks to them.
 
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 0001-Show-time-when-on-battery-power-bug-3736.patch: show time estimate
+      with recent kernels (sysfs attribute change post 2.6.30). Closes: #614280
+    - series: add this patch.
+  * debian/control: add myself to Uploaders.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Apr 2011 17:00:41 +0200
 
 xfce4-battery-plugin (1.0.0-1) experimental; urgency=low

Modified: goodies/trunk/xfce4-battery-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/control	2011-04-06 19:44:37 UTC (rev 5353)
+++ goodies/trunk/xfce4-battery-plugin/debian/control	2011-04-10 18:26:10 UTC (rev 5354)
@@ -2,7 +2,8 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), libgtk2.0-dev,
   xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl,
   libxfce4util-dev, libxfcegui4-dev, intltool, hardening-includes

Added: goodies/trunk/xfce4-battery-plugin/debian/patches/0001-Show-time-when-on-battery-power-bug-3736.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/0001-Show-time-when-on-battery-power-bug-3736.patch	                        (rev 0)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/0001-Show-time-when-on-battery-power-bug-3736.patch	2011-04-10 18:26:10 UTC (rev 5354)
@@ -0,0 +1,25 @@
+From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001
+From: flo <florian.a.jung at web.de>
+Date: Fri, 18 Feb 2011 18:21:12 +0100
+Subject: Show time when on battery power (bug #3736).
+
+---
+ panel-plugin/libacpi.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
+index 87339b7..838a760 100644
+--- a/panel-plugin/libacpi.c
++++ b/panel-plugin/libacpi.c
+@@ -787,7 +787,7 @@ int read_acpi_state_sysfs(int battery)
+ 			acpistate->rcapacity = read_sysfs_int(buf);
+ 			acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
+ 		}
+-		if (strcmp(name,"current_now") == 0)
++		if ((strcmp(name,"current_now") == 0) || (strcmp(name,"power_now") == 0))
+ 		{
+ 			sprintf(buf,"%s/%s",batteries[battery], name);
+ 			acpistate->prate = read_sysfs_int(buf);
+-- 
+1.7.4.1
+

Added: goodies/trunk/xfce4-battery-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/series	2011-04-10 18:26:10 UTC (rev 5354)
@@ -0,0 +1 @@
+0001-Show-time-when-on-battery-power-bug-3736.patch