Merge lp://qastaging/~noskcaj/ubuntu/saucy/xfce4-power-manager/1.2.0-2ubuntu1 into lp://qastaging/ubuntu/saucy/xfce4-power-manager
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/saucy/xfce4-power-manager/1.2.0-2ubuntu1 |
| Merge into: | lp://qastaging/ubuntu/saucy/xfce4-power-manager |
| Diff against target: |
12657 lines (+6506/-4889) 29 files modified
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/po/POTFILES.in (+19/-0) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/Makefile.am (+211/-0) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.c (+1078/-0) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.h (+71/-0) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-backlight.c (+478/-0) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-notify.c (+409/-0) .pc/03_fix-insert-battery.patch/src/xfpm-battery.c (+916/-0) .pc/03_fix-insert-battery.patch/src/xfpm-power.c (+1755/-0) .pc/06_fix-suspend-auth-check.patch/src/xfpm-power.c (+1/-0) .pc/09_fix_insert_battery.patch/src/xfpm-battery.c (+0/-916) .pc/09_fix_insert_battery.patch/src/xfpm-power.c (+0/-1755) .pc/applied-patches (+2/-1) debian/changelog (+35/-0) debian/control (+4/-2) debian/patches/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch (+1423/-0) debian/patches/02_translations-fix-invalid-format-strings.patch (+18/-12) debian/patches/03_fix-insert-battery.patch (+44/-0) debian/patches/06_fix-suspend-auth-check.patch (+5/-3) debian/patches/08_show_preferences_lxde.patch (+2/-2) debian/patches/series (+3/-1) debian/patches/xubuntu_fix-status-icon-other-devices.patch (+5/-3) debian/rules (+5/-1) po/POTFILES.in (+1/-0) po/ast.po (+0/-927) src/Makefile.am (+1/-3) src/gsd-media-keys-window.c (+0/-1078) src/gsd-media-keys-window.h (+0/-71) src/xfpm-backlight.c (+19/-113) src/xfpm-notify.c (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/saucy/xfce4-power-manager/1.2.0-2ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* Merged from debian unstable. Remaining changes:
- 06_fix-
permissions before disabling the corresponding drop-down menu item.
lp #929537
- 08_show_
environment which have another power manager.
- xubuntu_
for other devices (phone, wireless kbd, mouse, etc.).
- Switch to using logind for session tracking. Depend on systemd-services
instead of consolekit recommends, and add libsystemd-
dependency.
Unmerged revisions
- 34. By Jackson Doak
-
* Merged from debian unstable. Remaining changes:
- 06_fix-suspend- auth-check. patch: added, correctly check for suspend
permissions before disabling the corresponding drop-down menu item.
lp #929537
- 08_show_preferences_ lxde.patch: Hide settings menu only on desktop
environment which have another power manager.
- xubuntu_fix-status- icon-other- devices. patch: fix broken status icons
for other devices (phone, wireless kbd, mouse, etc.).
- Switch to using logind for session tracking. Depend on systemd-services
instead of consolekit recommends, and add libsystemd-login-dev build
dependency.
Good work. Uploaded.