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

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Fri Jun 30 00:59:48 2017
New Revision: 52493

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52493
Log:
Backport commit to allow GDM to work without gnome-session installed

Closes: #850291

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=52493&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Fri Jun 30 00:59:48 2017
@@ -1,3 +1,13 @@
+gdm3 (3.22.3-4) UNRELEASED; urgency=medium
+
+  * 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
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 29 Jun 2017 20:39:12 -0400
+
 gdm3 (3.22.3-3) unstable; urgency=medium
 
   * libgdm1: add breaks/replaces on good old gdm. Who knows how many users

Modified: desktop/unstable/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.install?rev=52493&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.install	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.install	[utf-8] Fri Jun 30 00:59:48 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=52493&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] Fri Jun 30 00:59:48 2017
@@ -0,0 +1,76 @@
+From 9b2b143090170b8a2d1d6012d705630364f3ad1d Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Thu, 29 Jun 2017 10:12:46 -0400
+Subject: [PATCH] data: Revert dropping gdm-shell.session
+
+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 |  3 +++
+ data/gdm-shell.session.in                |  3 +++
+ 3 files changed, 18 insertions(+)
+ create mode 100644 data/gdm-shell.session.in
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index f2875fcb..e2d3ebe8 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 += gdm-shell.session.in
++
++gdm-shell.session: $(srcdir)/gdm-shell.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 =  gdm-shell.session
++
+ pam_redhat_files = \
+ 	pam-redhat/gdm-autologin.pam		\
+ 	pam-redhat/gdm-launch-environment.pam	\
+@@ -178,6 +189,7 @@ CLEANFILES = 				\
+ 
+ DISTCLEANFILES =			\
+ 	$(dbusconf_DATA)		\
++	gdm-shell.session		\
+ 	gdm.schemas			\
+ 	$(NULL)
+ 
+diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings
+index c0b3cc66..eb8bc33c 100644
+--- a/data/dconf/defaults/00-upstream-settings
++++ b/data/dconf/defaults/00-upstream-settings
+@@ -25,6 +25,9 @@ disable-print-setup=true
+ disable-save-to-disk=true
+ disable-user-switching=true
+ 
++[org/gnome/desktop/session]
++session-name='gdm-shell'
++
+ [org/gnome/desktop/sound]
+ event-sounds=true
+ 
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+new file mode 100644
+index 00000000..278d8d43
+--- /dev/null
++++ b/data/gdm-shell.session.in
+@@ -0,0 +1,3 @@
++[GNOME Session]
++Name=Display Manager
++RequiredComponents=org.gnome.Shell;gnome-settings-daemon;
+-- 
+2.11.0

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=52493&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Fri Jun 30 00:59:48 2017
@@ -7,3 +7,4 @@
 Hack-D-Bus-messages-from-Debian-8-libgdm-to-work-wit.patch
 pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch
 stop-greeter-explicitly-when-finishing-display.patch
+revert_drop_gdm_shell_session.patch