Merge lp://qastaging/~unity-settings-daemon-team/unity-settings-daemon/x-sru2 into lp://qastaging/unity-settings-daemon/16.04
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 4142 |
| Merged at revision: | 4134 |
| Proposed branch: | lp://qastaging/~unity-settings-daemon-team/unity-settings-daemon/x-sru2 |
| Merge into: | lp://qastaging/unity-settings-daemon/16.04 |
| Diff against target: |
2307 lines (+977/-420) 25 files modified
debian/changelog (+30/-0) gnome-settings-daemon/Makefile.am (+34/-3) gnome-settings-daemon/gnome-settings-bus.c (+89/-0) gnome-settings-daemon/gnome-settings-bus.h (+36/-0) gnome-settings-daemon/gnome-settings-manager.c (+47/-4) gnome-settings-daemon/gnome-settings-session.c (+0/-62) gnome-settings-daemon/gnome-settings-session.h (+0/-34) gnome-settings-daemon/main.c (+2/-2) gnome-settings-daemon/org.gnome.ScreenSaver.xml (+43/-0) gnome-settings-daemon/org.gnome.SessionManager.xml (+451/-0) plugins/automount/gsd-automount-manager.c (+19/-45) plugins/background/gsd-background-manager.c (+2/-2) plugins/color/gsd-color-manager.c (+5/-3) plugins/common/gsd-input-helper.c (+3/-0) plugins/keyboard/gsd-keyboard-manager.c (+1/-1) plugins/media-keys/gsd-media-keys-manager.c (+31/-18) plugins/power/gsd-power-manager.c (+78/-162) plugins/remote-display/gsd-remote-display-manager.c (+1/-1) plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c (+54/-34) plugins/smartcard/gsd-smartcard-plugin.c (+8/-37) plugins/updates/gsd-updates-manager.c (+5/-5) plugins/updates/gsd-updates-refresh.c (+5/-5) plugins/wacom/gsd-wacom-manager.c (+8/-0) plugins/xrandr/gsd-xrandr-manager.c (+1/-1) plugins/xsettings/gsd-xsettings-manager.c (+24/-1) |
| To merge this branch: | bzr merge lp://qastaging/~unity-settings-daemon-team/unity-settings-daemon/x-sru2 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Commit message
Releasing SRU2 for Xenial
To post a comment you must log in.
Revision history for this message
| Marco Trevisan (Treviño) (3v1n0) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good but we should probably revert r4141 which is a behaviour change and arguable for a SRU