lp:~psusi/ubuntu/natty/gnome-power-manager/fix-duplicate-battery
- Get this branch:
- bzr branch lp:~psusi/ubuntu/natty/gnome-power-manager/fix-duplicate-battery
Branch merges
- Marc Deslauriers: Approve
- Michele Damiano Torelli (community): Approve
- Luke Yelavich: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 1358 lines (+1308/-3)6 files modified.pc/16-fix-duplicate-battery.patch/src/gpm-engine.c (+1277/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+8/-0)
debian/patches/16-fix-duplicate-battery.patch (+20/-0)
debian/patches/series (+2/-0)
src/gpm-engine.c (+0/-3)
Related bugs
Bug #675108: gnome-power-manager adds battery to indicator twice when battery hot-unplugged and plugged back in | Undecided | Fix Released | |
Bug #764055: Battery timing shown twice after suspend | Low | Fix Committed |
Related blueprints
Branch information
- Owner:
- Phillip Susi
- Status:
- Merged
Recent revisions
- 188. By Phillip Susi
-
16-fix-
duplicate- battery. patch: Don't add hot-added battery to device
list, because libupower-glib already does that (LP: #675108)
[ Maxim Levitsky <email address hidden> ] - 187. By Chris Coulson
-
[ Alex Murray <email address hidden> ]
* FFe: LP: #724324 - Add support to g-p-m for controlling keyboard
backlight via upower.
- add debian/patches/ 15-keyboard- backlight- support. patch
- update debian/patches/ series - 186. By Artur Rona
-
* Merge from debian unstable. Remaining changes: (LP: #708229)
- debian/control:
+ Build-Depends on gnome-common, needed for autoreconf in rules.
+ Build-Depends on libappindicator-dev.
- debian/gconf-defaults:
+ Remove default preference on
/apps/gnome- power-manager/ actions/ sleep_type_ battery (was set to
"nothing", however sleep_type_ac is "suspend".). Let's keep
default value "hibernate" currently.
- debian/{install, source_gnome-power- manager. py}:
+ Apport package hook.
- debian/patches/ 00git-devices- changed- signal. patch:
+ Add a "devices-changed" signal. This was already in 2.31.1,
but got dropped from the 2.32 branch. However, our appindicator
patch needs it now.
- debian/patches/ 02_autostart_ init.patch:
+ Dropped. This moved g-p-m to start in the initialization phase
and was inherited from Debian. It doesn't really solve any
problems for us, but does slow down login performance.
- debian/patches/ 02-notify- osd-support. patch:
+ Support Notify OSD.
- debian/patches/ 06-bugreport- debian. patch:
+ Dropped. It's actually wrong for Ubuntu, we use lsb_release,
not /etc/debian_version.
- debian/patches/ 08-desktop- bugreport- path.patch: Update headers.
- debian/patches/ 12-add- appindicators. patch:
+ Add support for application indicators.
- debian/patches/ 13-energy- star.patch: Change default timings
to be Energy Star 5.0 compliant, except for automatic suspend
on AC (since that might be both inconvenient, and suspend might
not work at all).
- debian/patches/ 14_fix_ no_xbacklight_ crash.patch:
+ Don't crash on systems which don't have XBACKLIGHT.
- debian/rules:
+ Run autoreconf.
+ Disable gconf-defaults, we have debian/gconf-defaults.
+ Enable flags for notify-osd, policykit and Indicator Applet.
+ Added CFLAGS on -Wno-cast-align to disable a warning on ARM
that's generated when GCC changes the size of a struct
due to alignment.
+ Don't install gnome-power-statistics. desktop
- debian/watch: Watch unstable series. - 185. By Martin Pitt
-
debian/
gconf-defaults: Default to "suspend" for low battery and "sleep
type" on battery, as hibernate is reportedly rather unreliable and also
very slow (and thus was disabled by default). - 184. By Chris Coulson
-
Drop debian/
patches/ 02_autostart_ init.patch. This moved g-p-m to
start in the initialization phase and was inherited from Debian.
It doesn't really solve any problems for us, but does slow down
login performance - 183. By Chris Coulson
-
Fix LP: #533652 - re-add debian/
patches/ 14-critical- message- timeout. patch,
as this wasn't committed upstream - 181. By Didier Roche-Tolomelli
-
* New upstream release:
- Only disable deprecated code for --enable-strict builds (Richard Hughes)
- Remove last traces of DeviceKit-power (Michael Biebl) - 180. By Robert Ancell
-
* New upstream release
* debian/patches/ 00git_brightnes s_applet_ build_1. patch:
* debian/patches/ 00git_brightnes s_applet_ build_2. patch:
* debian/patches/ 00git_inhibit_ applet_ build.patch:
* debian/patches/ 15_distclean. patch:
- Applied upstream - 179. By Ken VanDine
-
* debian/
patches/ 12-add- appindicators. patch
- Shorten strings for bettery status to match the specification at
https://wiki.ubuntu. com/BatteryStat usMenu# Items (LP: #619816)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/gnome-power-manager