Merge lp:~osomon/gnome-session/fix-1718446 into lp:~ubuntu-desktop/gnome-session/ubuntu

Proposed by Olivier Tilloy on 2017-10-11
Status: Merged
Merged at revision: 458
Proposed branch: lp:~osomon/gnome-session/fix-1718446
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 29 lines (+12/-0)
3 files modified
debian/changelog (+10/-0)
debian/gnome-session.links (+1/-0)
debian/ubuntu-session.links (+1/-0)
To merge this branch: bzr merge lp:~osomon/gnome-session/fix-1718446
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2017-10-18
Didier Roche 2017-10-11 Approve on 2017-10-13
Review via email: mp+332146@code.launchpad.net

Commit message

Add symlinks in /usr/share/xsessions/:
  - gnome.desktop -> gnome-xorg.desktop
  - ubuntu.desktop -> ubuntu-xorg.desktop
In combination with a gdm3 patch, this ensures a proper fallback session is selected by gdm when wayland is not enabled.

Description of the change

Note: this branch and https://code.launchpad.net/~osomon/gdm/fix-1718446/+merge/332145 need to be released together for the fix to be complete.

To post a comment you must log in.
lp:~osomon/gnome-session/fix-1718446 updated on 2017-10-13
457. By Olivier Tilloy on 2017-10-13

Merge back changes from parent branch.

Didier Roche (didrocks) wrote :

The additional session won't impact as won't be shown if wayland is enabled. If no wayland is available and Xorg only, people will have 2 sessions until they install the new GDM, which I think is fine.

Thanks for working on this!

review: Approve
Sebastien Bacher (seb128) wrote :

looks good, merging & uploading

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2017-10-13 10:00:17 +0000
+++ debian/changelog 2017-10-13 11:35:16 +0000
@@ -1,3 +1,13 @@
1gnome-session (3.26.1-0ubuntu6) UNRELEASED; urgency=medium
2
3 * Add symlinks in /usr/share/xsessions/:
4 - gnome.desktop -> gnome-xorg.desktop
5 - ubuntu.desktop -> ubuntu-xorg.desktop
6 In combination with a gdm3 patch, this ensures a proper fallback session
7 is selected by gdm when wayland is not enabled (LP: #1718446).
8
9 -- Olivier Tilloy <olivier.tilloy@canonical.com> Fri, 13 Oct 2017 13:33:27 +0200
10
1gnome-session (3.26.1-0ubuntu5) artful; urgency=medium11gnome-session (3.26.1-0ubuntu5) artful; urgency=medium
212
3 * debian/unity-gnome-shell-migration.17.10.py:13 * debian/unity-gnome-shell-migration.17.10.py:
414
=== added file 'debian/gnome-session.links'
--- debian/gnome-session.links 1970-01-01 00:00:00 +0000
+++ debian/gnome-session.links 2017-10-13 11:35:16 +0000
@@ -0,0 +1,1 @@
1usr/share/xsessions/gnome-xorg.desktop usr/share/xsessions/gnome.desktop
02
=== added file 'debian/ubuntu-session.links'
--- debian/ubuntu-session.links 1970-01-01 00:00:00 +0000
+++ debian/ubuntu-session.links 2017-10-13 11:35:16 +0000
@@ -0,0 +1,1 @@
1usr/share/xsessions/ubuntu-xorg.desktop usr/share/xsessions/ubuntu.desktop

Subscribers

People subscribed via source and target branches

to all changes: