r50206 - in /desktop/unstable/gnome-session/debian: changelog patches/Switch-back-to-Xorg-by-default.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Sep  7 21:50:45 2016
New Revision: 50206

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50206
Log:
Switch back to Xorg by default.
We divert from upstream here and switch the default GNOME session back to
Xorg for Stretch. This way, users who explicitly chose the GNOME session
in the display manager won't be automatically switched over to Wayland.
It's still possible to run Wayland via the "GNOME on Wayland" session.

Added:
    desktop/unstable/gnome-session/debian/patches/Switch-back-to-Xorg-by-default.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=50206&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog	[utf-8] Wed Sep  7 21:50:45 2016
@@ -1,3 +1,13 @@
+gnome-session (3.21.90-3) UNRELEASED; urgency=medium
+
+  * Switch back to Xorg by default.
+    We divert from upstream here and switch the default GNOME session back to
+    Xorg for Stretch. This way, users who explicitly chose the GNOME session
+    in the display manager won't be automatically switched over to Wayland.
+    It's still possible to run Wayland via the "GNOME on Wayland" session.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 07 Sep 2016 23:07:21 +0200
+
 gnome-session (3.21.90-2) experimental; urgency=medium
 
   * Add debian/patches/git_fix-bashism.patch (Closes: #835289)

Added: desktop/unstable/gnome-session/debian/patches/Switch-back-to-Xorg-by-default.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/Switch-back-to-Xorg-by-default.patch?rev=50206&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/Switch-back-to-Xorg-by-default.patch	(added)
+++ desktop/unstable/gnome-session/debian/patches/Switch-back-to-Xorg-by-default.patch	[utf-8] Wed Sep  7 21:50:45 2016
@@ -0,0 +1,67 @@
+From f95875db04c86d49b4544a871efd45bf8b116623 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Wed, 7 Sep 2016 23:45:18 +0200
+Subject: [PATCH] Switch back to Xorg by default
+
+We want to keep Xorg for the default gnome session in Stretch.
+
+Wayland can still be chosen easily via the "GNOME on Wayland" session.
+---
+ data/Makefile.am                                         | 4 ++--
+ data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +-
+ po/POTFILES.in                                           | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+ rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index ae08730..d0a7310 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir)
+ hwcompat_DATA = hardware-compatibility
+ 
+ xsessiondir = $(datadir)/xsessions
+-xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
++xsession_in_files = gnome.desktop.in
+ 
+ if BUILD_SESSION_SELECTOR
+ xsession_in_files += gnome-custom-session.desktop.in
+@@ -18,7 +18,7 @@ endif
+ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+ 
+ wayland_sessiondir = $(datadir)/wayland-sessions
+-wayland_session_in_files = gnome.desktop.in
++wayland_session_in_files = gnome-wayland.desktop.in
+ wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
+ 
+ sessiondir = $(datadir)/gnome-session/sessions
+diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
+similarity index 85%
+rename from data/gnome-xorg.desktop.in
+rename to data/gnome-wayland.desktop.in
+index d00b3dc..852be87 100644
+--- a/data/gnome-xorg.desktop.in
++++ b/data/gnome-wayland.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-_Name=GNOME on Xorg
++_Name=GNOME on Wayland
+ _Comment=This session logs you into GNOME
+ Exec=gnome-session
+ TryExec=gnome-session
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index cc1170a..23e4c1f 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -2,7 +2,7 @@
+ # Please keep this file sorted alphabetically.
+ data/gnome-custom-session.desktop.in
+ data/gnome.desktop.in
+-data/gnome-xorg.desktop.in
++data/gnome-wayland.desktop.in
+ data/gnome-dummy.session.desktop.in.in
+ data/gnome.session.desktop.in.in
+ [type: gettext/glade]data/session-selector.ui
+-- 
+2.9.3
+

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=50206&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series	[utf-8] Wed Sep  7 21:50:45 2016
@@ -1 +1,2 @@
 git_fix-bashism.patch
+Switch-back-to-Xorg-by-default.patch