Merge lp://qastaging/~darkxst/gnome-session/3.14 into lp://qastaging/~ubuntu-desktop/gnome-session/ubuntu
Proposed by
Tim Lunn
| Status: | Merged |
|---|---|
| Merged at revision: | 320 |
| Proposed branch: | lp://qastaging/~darkxst/gnome-session/3.14 |
| Merge into: | lp://qastaging/~ubuntu-desktop/gnome-session/ubuntu |
| Diff against target: |
6468 lines (+4434/-1736) 22 files modified
debian/changelog (+167/-0) debian/control (+13/-15) debian/control.in (+12/-10) debian/defaults.list (+198/-200) debian/gnome-session-common.dirs (+1/-0) debian/gnome-session-common.install (+1/-0) debian/gnome-session.install (+2/-0) debian/patches/01_gnome-wm.patch (+0/-11) debian/patches/02_fallback_desktop.patch (+0/-12) debian/patches/03_fallback_desktop_makefile.patch (+0/-13) debian/patches/101_screen_lock_on_suspend.patch (+0/-92) debian/patches/10_session_save.patch (+0/-536) debian/patches/12_no_gdm_fallback.patch (+0/-27) debian/patches/13_display_session_properties.patch (+4/-4) debian/patches/50_ubuntu_sessions.patch (+23/-13) debian/patches/52_xdg_current_desktop.patch (+0/-46) debian/patches/80_new_upstream_session_dialog.patch (+0/-699) debian/patches/95_dbus_request_shutdown.patch (+12/-18) debian/patches/git_fix_wrong_unref_call.patch (+0/-32) debian/patches/revert_remove_gnome_session_properties.patch (+3992/-0) debian/patches/series (+1/-6) debian/rules (+8/-2) |
| To merge this branch: | bzr merge lp://qastaging/~darkxst/gnome-session/3.14 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
gnome-session-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for the merge! debian/control needed an update for commenting out xwayland and @GNOME_TEAM@, I did that. Otherwise looks good, merged/uploaded.