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

[Olivier Tilloy]

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.

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.

[lp:~osomon/gnome-session/fix-1718446]

457. By Olivier Tilloy on 2017-10-13

Merge back changes from parent branch.

[Didier Roche-Tolomelli (didrocks)]

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)]

looks good, merging & uploading

review: Approve

=== 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 @@
+gnome-session (3.26.1-0ubuntu6) UNRELEASED; urgency=medium
+
+  * 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 (LP: #1718446).
+
+ -- Olivier Tilloy <[e-mail]>  Fri, 13 Oct 2017 13:33:27 +0200
+
 gnome-session (3.26.1-0ubuntu5) artful; urgency=medium
 
   * debian/unity-gnome-shell-migration.17.10.py:
 
=== 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 @@
+usr/share/xsessions/gnome-xorg.desktop usr/share/xsessions/gnome.desktop
 
=== 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 @@
+usr/share/xsessions/ubuntu-xorg.desktop usr/share/xsessions/ubuntu.desktop