Merge lp://qastaging/~noskcaj/ubuntu/utopic/xfce4-power-manager/merge into lp://qastaging/ubuntu/utopic/xfce4-power-manager
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/xfce4-power-manager/merge |
| Merge into: | lp://qastaging/ubuntu/utopic/xfce4-power-manager |
| Diff against target: |
60 lines (+33/-2) 2 files modified
debian/changelog (+30/-0) debian/control (+3/-2) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/xfce4-power-manager/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 41. By Jackson Doak
-
* Merge from debian. 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.
- Switch to using logind for session tracking. Depend on systemd-services
instead of consolekit recommends, and add libsystemd-login-dev build
dependency.
- 05_dont-allow-systemd- to-handle- suspend- hibernate- events. patch
- 06_add-shutdown- reboot- functionality- for-systemd. patch
- 07_fix-screen- dimming. patch
- 09_sync_session_ xfpm_lock_ setting. patch
- 10_inhibit_logind. patch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.