r52755 - in /desktop/unstable/gdm3/debian: changelog gdm3.install patches/revert_drop_gdm_shell_session.patch patches/series

Mon Aug 7 11:28:40 UTC 2017

Author: bigon
Date: Mon Aug  7 11:28:40 2017
New Revision: 52755

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52755
Log:
* Add revert_drop_gdm_shell_session.patch:
  - Backport commit to allow GDM to work without gnome-session installed
    (Closes: #850291)
* debian/gdm3.install:
  - Install gnome-session file

Added:
    desktop/unstable/gdm3/debian/patches/revert_drop_gdm_shell_session.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.install
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=52755&op=diff
==============================================================================

--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Mon Aug  7 11:28:40 2017
@@ -4,8 +4,13 @@
   * debian/control.in:
     - Bump Standards-Version to 4.0.0 (no further changes)
     - Bump gnome-settings-daemon dependency to 3.24
-
- -- Laurent Bigonville <bigon at debian.org>  Thu, 06 Jul 2017 01:36:45 +0200
+  * Add revert_drop_gdm_shell_session.patch:
+    - Backport commit to allow GDM to work without gnome-session installed
+      (Closes: #850291)
+  * debian/gdm3.install:
+    - Install gnome-session file
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 07 Aug 2017 13:09:47 +0200
 
 gdm3 (3.24.2-2) experimental; urgency=medium
 

Modified: desktop/unstable/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.install?rev=52755&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.install	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.install	[utf-8] Mon Aug  7 11:28:40 2017
@@ -13,6 +13,7 @@
 usr/share/gdm/locale.alias
 usr/share/gdm/greeter
 usr/share/gdm/*.schemas
+usr/share/gnome-session/
 usr/share/dconf/
 var/*
 

Added: desktop/unstable/gdm3/debian/patches/revert_drop_gdm_shell_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/revert_drop_gdm_shell_session.patch?rev=52755&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/revert_drop_gdm_shell_session.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/revert_drop_gdm_shell_session.patch	[utf-8] Mon Aug  7 11:28:40 2017
@@ -0,0 +1,79 @@
+From 1073f0e792d9d5bf9d53bddb6e51177c8024c2b3 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Thu, 29 Jun 2017 10:12:46 -0400
+Subject: data: Add gnome-login.session
+
+This reverts
+https://git.gnome.org/browse/gdm/commit/?id=f66cdfcb2
+and renames the session from gdm-shell to gnome-login.
+
+The removal caused problems for Ubuntu 17.10 which does not
+include gnome.session by default.
+
+https://launchpad.net/bugs/1701243
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784340
+---
+ data/Makefile.am                         | 12 ++++++++++++
+ data/dconf/defaults/00-upstream-settings |  2 +-
+ data/gnome-login.session.in              |  3 +++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 data/gnome-login.session.in
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index f2875fc..c10c915 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -86,9 +86,20 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
+ 		-e 's,[@]sbindir[@],$(sbindir),g' \
+ 		<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
+ 
++
++EXTRA_DIST += gnome-login.session.in
++
++gnome-login.session: $(srcdir)/gnome-login.session.in
++	sed	-e 's,[@]libexecdir[@],$(libexecdir),g' \
++		-e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \
++		< $< > $@.tmp && mv $@.tmp $@
++
+ localealiasdir = $(datadir)/gdm
+ localealias_DATA = locale.alias
+ 
++sessiondir = $(datadir)/gnome-session/sessions
++session_DATA =  gnome-login.session
++
+ pam_redhat_files = \
+ 	pam-redhat/gdm-autologin.pam		\
+ 	pam-redhat/gdm-launch-environment.pam	\
+@@ -179,6 +190,7 @@ CLEANFILES = 				\
+ DISTCLEANFILES =			\
+ 	$(dbusconf_DATA)		\
+ 	gdm.schemas			\
++	gnome-login.session		\
+ 	$(NULL)
+ 
+ MAINTAINERCLEANFILES =			\
+diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings
+index c0b3cc6..175d661 100644
+--- a/data/dconf/defaults/00-upstream-settings
++++ b/data/dconf/defaults/00-upstream-settings
+@@ -7,7 +7,7 @@
+ #
+ 
+ [org/gnome/desktop/session]
+-session-name='gnome'
++session-name='gnome-login'
+ 
+ [org/gnome/desktop/background]
+ show-desktop-icons=false
+diff --git a/data/gnome-login.session.in b/data/gnome-login.session.in
+new file mode 100644
+index 0000000..278d8d4
+--- /dev/null
++++ b/data/gnome-login.session.in
+@@ -0,0 +1,3 @@
++[GNOME Session]
++Name=Display Manager
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Orientation;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XRANDR;org.gnome.SettingsDaemon.XSettings;
+-- 
+cgit v0.12

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=52755&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Mon Aug  7 11:28:40 2017
@@ -4,3 +4,4 @@
 92_systemd_unit.patch
 93_translate-default-desktop.patch
 94_retain_xorg_log.patch
+revert_drop_gdm_shell_session.patch


