Merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master

[Marco Trevisan (Treviño)]

[Didier Roche-Tolomelli (didrocks)]

Thanks for looking and thinking about changing the script name! LGTM.

[Didier Roche-Tolomelli (didrocks)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3e9254f..d9a8a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-session (3.30.0-0ubuntu5) UNRELEASED; urgency=medium
+
+  * debian/ubuntu-settings-migrate-to-defaults.18.10.0.py:
+    - renamed to ubuntu-settings-migrate-to-defaults.18.10.1.py
+      + Also run in ubuntu-wayland desktop session (LP: #1799205)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 22 Oct 2018 13:30:47 +0200
+
 gnome-session (3.30.0-0ubuntu4) cosmic; urgency=medium
 
   * Make {ubuntu,gnome}-session Arch: all and remove qualification on xwayland
diff --git a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py
index 7e4e663..d0dad7e 100755
--- a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
+++ b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py
@@ -33,7 +33,7 @@ OLD_DEFAULTS = {
     }
 }
 
-if os.getenv('DESKTOP_SESSION') != 'ubuntu':
+if os.getenv('DESKTOP_SESSION') not in ['ubuntu', 'ubuntu-wayland']:
     sys.exit(0)
 
 any_changed = False