Package: gdm3 Version: 3.14.1-7 Severity: wishlist Tags: patch Dear Maintainer,
given that almost 70% of GNOME is now up-to-date in unstable/sid, it would be great if also gdm3 could be updated soon. Aiming for it, I've spent some spare time on updating the packaging and attached you'll find a debdiff from 3.14.1-7 to 3.16.1.1-1 (first eventual revision of this new upstream release). While it's known to fail[1] due to a classic autopoint-vs-intltoolize issue, I hope this initial update could help sprinting the upgrade. Cheers. [1] http://debomatic-amd64.debian.net/distribution#experimental/gdm3/3.16.1.1-1/buildlog -- System Information: Debian Release: stretch/sid APT prefers buildd-unstable APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages gdm3 depends on: ii accountsservice 0.6.40-2 ii adduser 3.113+nmu3 ii dconf-cli 0.24.0-2 ii dconf-gsettings-backend 0.24.0-2 ii debconf [debconf-2.0] 1.5.56 ii gir1.2-gdm3 3.14.1-7 ii gnome-session [x-session-manager] 3.16.0-1 ii gnome-session-bin 3.16.0-1 ii gnome-settings-daemon 3.14.2-3 ii gnome-shell 3.14.4-1 ii gnome-terminal [x-terminal-emulator] 3.16.2-1 ii gsettings-desktop-schemas 3.16.1-1 ii libaccountsservice0 0.6.40-2 ii libaudit1 1:2.4.2-1 ii libc6 2.19-18 ii libcanberra-gtk3-0 0.30-2.1 ii libcanberra0 0.30-2.1 ii libgdk-pixbuf2.0-0 2.31.4-2 ii libgdm1 3.14.1-7 ii libglib2.0-0 2.44.1-1 ii libglib2.0-bin 2.44.1-1 ii libgtk-3-0 3.14.5-1 ii libpam-modules 1.1.8-3.1 ii libpam-runtime 1.1.8-3.1 ii libpam-systemd 220-5 ii libpam0g 1.1.8-3.1 ii librsvg2-common 2.40.9-2 ii libselinux1 2.3-2 ii libsystemd0 220-5 ii libwrap0 7.6.q-25 ii libx11-6 2:1.6.3-1 ii libxau6 1:1.0.8-1 ii libxdmcp6 1:1.1.2-1 ii libxrandr2 2:1.4.2-1+b1 ii lsb-base 4.1+Debian13+nmu1 ii metacity [x-window-manager] 1:3.14.3-1 ii mutter [x-window-manager] 3.14.4-2+b1 ii policykit-1 0.105-8 ii ucf 3.0030 ii x11-common 1:7.7+9 ii x11-xserver-utils 7.7+4 ii xterm [x-terminal-emulator] 318-2 Versions of packages gdm3 recommends: ii at-spi2-core 2.16.0-1 ii desktop-base 8.0.2 ii gnome-icon-theme 3.12.0-1 ii gnome-icon-theme-symbolic 3.12.0-1 ii x11-xkb-utils 7.7+2 ii xserver-xephyr 2:1.17.1-2 ii xserver-xorg 1:7.7+9 ii zenity 3.16.2-1 Versions of packages gdm3 suggests: ii gnome-orca 3.16.2-1 ii libpam-gnome-keyring 3.16.0-2 -- debconf information: * shared/default-x-display-manager: gdm3 gdm3/daemon_name: /usr/sbin/gdm3 -- Matteo F. Vescovi || Debian Developer GnuPG KeyID: 4096R/0x8062398983B2CF7A
diff -Nru gdm3-3.14.1/debian/changelog gdm3-3.16.1.1/debian/changelog --- gdm3-3.14.1/debian/changelog 2015-04-04 09:20:26.000000000 +0200 +++ gdm3-3.16.1.1/debian/changelog 2015-06-08 09:48:19.000000000 +0200 @@ -1,3 +1,27 @@ +gdm3 (3.16.1.1-1) experimental; urgency=medium + + * Team upload + + * New upstream release + - debian/gdm3.install: empty install path dropped + - debian/patches/: patchset re-worked against v3.16.1.1 + - 08_frequent-users_greeter.patch refreshed + - 09_default_session.patch refreshed + - 16_xserver_path.patch refreshed + - 17_switch_on_finish.patch refreshed + - 18_all_displays_transient.patch dropped + - 19_switch_kill_greeter.patch refreshed + - 90_config_comments.patch refreshed + - 91_dconf_database_path.patch refreshed + - 92_systemd_unit.patch refreshed + - 93_disable_gvfs.patch refreshed + - 94_retain_xorg_log.patch refreshed + - 95_systemd-import-language-into-daemon-environment.patch dropped + (applied upstream) + - 96_plymouth-quit.patch dropped (applied upstream) + + -- Matteo F. Vescovi <[email protected]> Mon, 08 Jun 2015 09:48:17 +0200 + gdm3 (3.14.1-7) unstable; urgency=medium * Add Conflicts/Replaces: gdm in libgdm1 as well. Closes: #781535. diff -Nru gdm3-3.14.1/debian/gdm3.install gdm3-3.16.1.1/debian/gdm3.install --- gdm3-3.14.1/debian/gdm3.install 2014-05-06 14:53:21.000000000 +0200 +++ gdm3-3.16.1.1/debian/gdm3.install 2015-06-05 22:51:11.000000000 +0200 @@ -5,7 +5,6 @@ # gets renamed to gdm3 in binary-install debian/tmp/usr/sbin/gdm debian/tmp/usr/share/pixmaps/ -debian/tmp/usr/share/gnome-session/ debian/tmp/usr/share/locale/ debian/tmp/usr/share/icons/ debian/tmp/usr/share/help/ diff -Nru gdm3-3.14.1/debian/patches/08_frequent-users_greeter.patch gdm3-3.16.1.1/debian/patches/08_frequent-users_greeter.patch --- gdm3-3.14.1/debian/patches/08_frequent-users_greeter.patch 2014-03-21 21:25:35.000000000 +0100 +++ gdm3-3.16.1.1/debian/patches/08_frequent-users_greeter.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,6 +1,16 @@ +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 21:21:35 +0200 +Subject: 08_frequent-users_greeter + +--- + daemon/gdm-session.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 33a08e3..3fb3cfd 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -1891,6 +1891,7 @@ +@@ -1932,6 +1932,7 @@ on_setup_complete_cb (GdmDBusWorker *proxy, 0, service_name); diff -Nru gdm3-3.14.1/debian/patches/09_default_session.patch gdm3-3.16.1.1/debian/patches/09_default_session.patch --- gdm3-3.14.1/debian/patches/09_default_session.patch 2014-03-21 21:25:35.000000000 +0100 +++ gdm3-3.16.1.1/debian/patches/09_default_session.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,9 +1,16 @@ -Description: Prefer "default.desktop", so that other desktop environments like XFCE can use gdm, too, without being forced to start GNOME. -Ubuntu: https://launchpad.net/bugs/403291 -Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=594733 +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 21:22:24 +0200 +Subject: 09_default_session + +--- + daemon/gdm-session.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 3fb3cfd..137f996 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -536,7 +536,7 @@ +@@ -508,7 +508,7 @@ get_fallback_session_name (GdmSession *self) } } diff -Nru gdm3-3.14.1/debian/patches/16_xserver_path.patch gdm3-3.16.1.1/debian/patches/16_xserver_path.patch --- gdm3-3.14.1/debian/patches/16_xserver_path.patch 2014-03-21 21:25:35.000000000 +0100 +++ gdm3-3.16.1.1/debian/patches/16_xserver_path.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,6 +1,16 @@ +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 21:23:01 +0200 +Subject: 16_xserver_path + +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b7e86f8..3736e80 100644 --- a/configure.ac +++ b/configure.ac -@@ -1244,7 +1244,10 @@ +@@ -1239,7 +1239,10 @@ dnl --------------------------------------------------------------------------- # and /usr/X11 since they often symlink to each other, and configure # should use the more stable location (the real directory) if possible. # diff -Nru gdm3-3.14.1/debian/patches/17_switch_on_finish.patch gdm3-3.16.1.1/debian/patches/17_switch_on_finish.patch --- gdm3-3.14.1/debian/patches/17_switch_on_finish.patch 2014-08-14 02:10:01.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/17_switch_on_finish.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,27 +1,35 @@ -daemon: add switch-on-finish property to display +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 21:57:20 +0200 +Subject: 17_switch_on_finish -Index: gdm3-3.12.2/daemon/gdm-display.c -=================================================================== ---- gdm3-3.12.2.orig/daemon/gdm-display.c 2014-08-14 01:09:48.102831204 +0200 -+++ gdm3-3.12.2/daemon/gdm-display.c 2014-08-14 01:10:35.310113921 +0200 -@@ -65,6 +65,7 @@ struct GdmDisplayPrivate +daemon: add switch-on-finish property to display. +--- + daemon/gdm-display.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + daemon/gdm-display.h | 3 +++ + 2 files changed, 45 insertions(+) + +diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c +index 20cda93..5adcc60 100644 +--- a/daemon/gdm-display.c ++++ b/daemon/gdm-display.c +@@ -74,6 +74,7 @@ struct GdmDisplayPrivate + gsize x11_cookie_size; GdmDisplayAccessFile *access_file; - gboolean is_local; + gboolean switch_on_finish; guint finish_idle_id; - GdmSlave *slave; -@@ -89,6 +90,7 @@ enum { - PROP_X11_COOKIE, + Display *x11_display; +@@ -111,6 +112,7 @@ enum { PROP_X11_AUTHORITY_FILE, + PROP_IS_CONNECTED, PROP_IS_LOCAL, + PROP_SWITCH_ON_FINISH, - PROP_SLAVE_TYPE, - PROP_IS_INITIAL - }; -@@ -135,6 +137,14 @@ gdm_display_get_session_id (GdmDisplay * - return display->priv->session_id; + PROP_LAUNCH_ENVIRONMENT, + PROP_IS_INITIAL, + PROP_ALLOW_TIMED_LOGIN, +@@ -231,6 +233,14 @@ gdm_display_get_session_id (GdmDisplay *self) + return self->priv->session_id; } +gboolean @@ -33,9 +41,9 @@ +} + static GdmDisplayAccessFile * - _create_access_file_for_user (GdmDisplay *display, + _create_access_file_for_user (GdmDisplay *self, const char *username, -@@ -801,6 +811,13 @@ _gdm_display_set_session_id (GdmDisplay +@@ -771,6 +781,13 @@ _gdm_display_set_session_type (GdmDisplay *self, } static void @@ -46,11 +54,11 @@ +} + +static void - _gdm_display_set_remote_hostname (GdmDisplay *display, + _gdm_display_set_remote_hostname (GdmDisplay *self, const char *hostname) { -@@ -852,6 +869,16 @@ _gdm_display_set_is_initial (GdmDisplay - display->priv->is_initial = initial; +@@ -826,6 +843,16 @@ _gdm_display_set_is_initial (GdmDisplay *self, + self->priv->is_initial = initial; } +void @@ -64,33 +72,32 @@ +} + static void - gdm_display_set_property (GObject *object, - guint prop_id, -@@ -890,6 +917,9 @@ gdm_display_set_property (GObject + _gdm_display_set_allow_timed_login (GdmDisplay *self, + gboolean allow_timed_login) +@@ -878,6 +905,9 @@ gdm_display_set_property (GObject *object, case PROP_IS_LOCAL: _gdm_display_set_is_local (self, g_value_get_boolean (value)); break; + case PROP_SWITCH_ON_FINISH: + _gdm_display_set_switch_on_finish (self, g_value_get_boolean (value)); + break; - case PROP_SLAVE_TYPE: - _gdm_display_set_slave_type (self, g_value_get_gtype (value)); + case PROP_ALLOW_TIMED_LOGIN: + _gdm_display_set_allow_timed_login (self, g_value_get_boolean (value)); break; -@@ -944,6 +974,9 @@ gdm_display_get_property (GObject +@@ -942,6 +972,9 @@ gdm_display_get_property (GObject *object, case PROP_IS_LOCAL: g_value_set_boolean (value, self->priv->is_local); break; + case PROP_SWITCH_ON_FINISH: + g_value_set_boolean (value, self->priv->switch_on_finish); + break; - case PROP_SLAVE_TYPE: - g_value_set_gtype (value, self->priv->slave_type); + case PROP_IS_CONNECTED: + g_value_set_boolean (value, self->priv->x11_display != NULL); break; -@@ -1351,6 +1384,14 @@ gdm_display_class_init (GdmDisplayClass - NULL, +@@ -1253,6 +1286,15 @@ gdm_display_class_init (GdmDisplayClass *klass) NULL, TRUE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, + PROP_SWITCH_ON_FINISH, @@ -98,14 +105,16 @@ + NULL, + NULL, + TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); ++ g_object_class_install_property (object_class, -Index: gdm3-3.12.2/daemon/gdm-display.h -=================================================================== ---- gdm3-3.12.2.orig/daemon/gdm-display.h 2014-08-14 01:09:48.102831204 +0200 -+++ gdm3-3.12.2/daemon/gdm-display.h 2014-08-14 01:09:48.098831265 +0200 -@@ -136,6 +136,9 @@ gboolean gdm_display_get_time + PROP_IS_CONNECTED, + g_param_spec_boolean ("is-connected", +diff --git a/daemon/gdm-display.h b/daemon/gdm-display.h +index 6d5e88d..8c0bd4a 100644 +--- a/daemon/gdm-display.h ++++ b/daemon/gdm-display.h +@@ -116,6 +116,9 @@ gboolean gdm_display_is_local (GdmDisplay *disp gboolean gdm_display_is_initial (GdmDisplay *display, gboolean *initial, GError **error); @@ -115,15 +124,3 @@ gboolean gdm_display_get_x11_cookie (GdmDisplay *display, const char **x11_cookie, -Index: gdm3-3.12.2/daemon/gdm-transient-display.c -=================================================================== ---- gdm3-3.12.2.orig/daemon/gdm-transient-display.c 2014-08-14 01:09:48.102831204 +0200 -+++ gdm3-3.12.2/daemon/gdm-transient-display.c 2014-08-14 01:09:52.000000000 +0200 -@@ -188,6 +188,7 @@ gdm_transient_display_new (int display_n - object = g_object_new (GDM_TYPE_TRANSIENT_DISPLAY, - "x11-display-number", display_number, - "x11-display-name", x11_display, -+ "switch-on-finish", TRUE, - NULL); - g_free (x11_display); - diff -Nru gdm3-3.14.1/debian/patches/18_all_displays_transient.patch gdm3-3.16.1.1/debian/patches/18_all_displays_transient.patch --- gdm3-3.14.1/debian/patches/18_all_displays_transient.patch 2014-11-09 19:54:17.000000000 +0100 +++ gdm3-3.16.1.1/debian/patches/18_all_displays_transient.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -Make all local displays "transient". -By default, they are not reaped at the end of the session and go back to -the login prompt. - -Index: gdm3-3.14.1/daemon/Makefile.am -=================================================================== ---- gdm3-3.14.1.orig/daemon/Makefile.am 2014-11-09 18:30:31.474923397 +0100 -+++ gdm3-3.14.1/daemon/Makefile.am 2014-11-09 18:30:31.470923456 +0100 -@@ -35,7 +35,6 @@ AM_CPPFLAGS = \ - BUILT_SOURCES = \ - gdm-display-glue.h \ - gdm-manager-glue.h \ -- gdm-static-display-glue.h \ - gdm-transient-display-glue.h \ - gdm-local-display-factory-glue.h \ - gdm-session-glue.h \ -@@ -63,13 +62,6 @@ gdm-transient-display-glue.c gdm-transie - --generate-c-code=gdm-transient-display-glue \ - $(srcdir)/gdm-transient-display.xml - --gdm-static-display-glue.c gdm-static-display-glue.h: gdm-static-display.xml Makefile.am -- $(AM_V_GEN)gdbus-codegen \ -- --c-namespace=GdmDBus \ -- --interface-prefix=org.gnome.DisplayManager \ -- --generate-c-code=gdm-static-display-glue \ -- $(srcdir)/gdm-static-display.xml -- - gdm-local-display-factory-glue.c gdm-local-display-factory-glue.h : gdm-local-display-factory.xml Makefile.am - $(AM_V_GEN)gdbus-codegen \ - --c-namespace=GdmDBus \ -@@ -186,8 +178,6 @@ gdm_SOURCES = \ - gdm-local-display-factory.h \ - gdm-display.c \ - gdm-display.h \ -- gdm-static-display.c \ -- gdm-static-display.h \ - gdm-transient-display.c \ - gdm-transient-display.h \ - gdm-launch-environment.c \ -@@ -223,8 +213,6 @@ nodist_gdm_SOURCES = \ - gdm-manager-glue.c \ - gdm-transient-display-glue.h \ - gdm-transient-display-glue.c \ -- gdm-static-display-glue.h \ -- gdm-static-display-glue.c \ - gdm-session-glue.h \ - gdm-session-glue.c \ - gdm-session-worker-glue.c \ -@@ -281,7 +269,6 @@ CLEANFILES = \ - gdm-session-glue.c \ - gdm-session-worker-glue.c \ - gdm-session-enum-types.c \ -- gdm-static-display-glue.c \ - gdm-transient-display-glue.c \ - $(BUILT_SOURCES) \ - $(NULL) -@@ -291,7 +278,6 @@ EXTRA_DIST = \ - gdm-session-worker.xml \ - gdm-session.xml \ - gdm-display.xml \ -- gdm-static-display.xml \ - gdm-transient-display.xml \ - gdm-local-display-factory.xml \ - gdm-session-enum-types.c.in \ -Index: gdm3-3.14.1/daemon/gdm-local-display-factory.c -=================================================================== ---- gdm3-3.14.1.orig/daemon/gdm-local-display-factory.c 2014-11-09 18:30:31.474923397 +0100 -+++ gdm3-3.14.1/daemon/gdm-local-display-factory.c 2014-11-09 18:30:31.474923397 +0100 -@@ -35,7 +35,6 @@ - #include "gdm-local-display-factory-glue.h" - - #include "gdm-display-store.h" --#include "gdm-static-display.h" - #include "gdm-transient-display.h" - - #define GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LOCAL_DISPLAY_FACTORY, GdmLocalDisplayFactoryPrivate)) -@@ -290,8 +289,8 @@ on_display_status_changed (GdmDisplay - g_hash_table_remove (factory->priv->displays, GUINT_TO_POINTER (num)); - gdm_display_store_remove (store, display); - -- /* Create a new equivalent display if it was static */ -- if (GDM_IS_STATIC_DISPLAY (display)) { -+ /* Create a new equivalent display if needed */ -+ if (gdm_display_get_switch_on_finish (display)) { - /* reset num failures */ - factory->priv->num_failures = 0; - -@@ -303,8 +302,8 @@ on_display_status_changed (GdmDisplay - so that it doesn't get reused */ - gdm_display_store_remove (store, display); - -- /* Create a new equivalent display if it was static */ -- if (GDM_IS_STATIC_DISPLAY (display)) { -+ /* Create a new equivalent display if needed */ -+ if (gdm_display_get_switch_on_finish (display)) { - - factory->priv->num_failures++; - -@@ -370,7 +369,7 @@ create_display (GdmLocalDisplayFactory * - - num = take_next_display_number (factory); - -- display = gdm_static_display_new (num); -+ display = gdm_transient_display_new (num); - - g_object_set (display, "seat-id", seat_id, NULL); - g_object_set (display, "is-initial", initial, NULL); -Index: gdm3-3.14.1/daemon/gdm-transient-display.c -=================================================================== ---- gdm3-3.14.1.orig/daemon/gdm-transient-display.c 2014-11-09 18:30:31.474923397 +0100 -+++ gdm3-3.14.1/daemon/gdm-transient-display.c 2014-11-09 18:31:03.034454271 +0100 -@@ -94,9 +94,22 @@ gdm_transient_display_manage (GdmDisplay - static gboolean - gdm_transient_display_finish (GdmDisplay *display) - { -+ int status; -+ - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - -- GDM_DISPLAY_CLASS (gdm_transient_display_parent_class)->finish (display); -+ if (gdm_display_get_switch_on_finish (display)) { -+ /* restart display */ -+ gdm_display_unmanage (display); -+ -+ status = gdm_display_get_status (display); -+ if (status != GDM_DISPLAY_FAILED) { -+ gdm_display_manage (display); -+ } -+ } else { -+ /* Call parent's finish to be put in the FINISHED state */ -+ GDM_DISPLAY_CLASS (gdm_transient_display_parent_class)->finish (display); -+ } - - return TRUE; - } -@@ -117,9 +130,16 @@ gdm_transient_display_get_timed_login_de - char **usernamep, - int *delayp) - { -- *enabledp = FALSE; -- *usernamep = g_strdup (""); -- *delayp = 0; -+ gboolean is_initial = FALSE; -+ gdm_display_is_initial (display, &is_initial, NULL); -+ -+ if (is_initial) { -+ GDM_DISPLAY_CLASS (gdm_transient_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); -+ } else { -+ *enabledp = FALSE; -+ *usernamep = g_strdup (""); -+ *delayp = 0; -+ } - } - - static GObject * diff -Nru gdm3-3.14.1/debian/patches/19_switch_kill_greeter.patch gdm3-3.16.1.1/debian/patches/19_switch_kill_greeter.patch --- gdm3-3.14.1/debian/patches/19_switch_kill_greeter.patch 2014-08-14 02:10:01.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/19_switch_kill_greeter.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,7 +1,17 @@ -Index: gdm3-3.12.2/configure.ac -=================================================================== ---- gdm3-3.12.2.orig/configure.ac 2014-08-13 21:37:53.886754675 +0200 -+++ gdm3-3.12.2/configure.ac 2014-08-14 00:27:12.457744070 +0200 +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 22:18:05 +0200 +Subject: 19_switch_kill_greeter + +--- + configure.ac | 13 +++++++++++++ + daemon/gdm-manager.c | 21 +++++++++++++++------ + daemon/gdm-server.c | 4 ++++ + 3 files changed, 32 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3736e80..e90ea23 100644 +--- a/configure.ac ++++ b/configure.ac @@ -274,6 +274,11 @@ AC_ARG_WITH(at-spi-registryd-directory, AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory AC_SUBST(AT_SPI_REGISTRYD_DIR) @@ -14,8 +24,8 @@ # Allow configuration of default PATH # withval="" -@@ -991,6 +996,14 @@ AC_SUBST(PLYMOUTH_CFLAGS) - AC_SUBST(PLYMOUTH_LIBS) +@@ -994,6 +999,14 @@ AC_SUBST(PLYMOUTH_LIBS) + AC_SUBST(PLYMOUTH_QUIT_SERVICE) dnl --------------------------------------------------------------------------- +dnl - Check for vt switch support @@ -29,20 +39,20 @@ dnl - Check for D-Bus dnl --------------------------------------------------------------------------- -Index: gdm3-3.12.2/daemon/gdm-manager.c -=================================================================== ---- gdm3-3.12.2.orig/daemon/gdm-manager.c 2014-08-13 23:26:29.000000000 +0200 -+++ gdm3-3.12.2/daemon/gdm-manager.c 2014-08-14 00:57:53.365712128 +0200 -@@ -108,6 +108,8 @@ static void create_seed_session_for_disp - uid_t allowed_user); - static void touch_ran_once_marker_file (GdmManager *manager); +diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c +index 64f11dd..7df26bf 100644 +--- a/daemon/gdm-manager.c ++++ b/daemon/gdm-manager.c +@@ -137,6 +137,8 @@ static GdmSession *create_embryonic_user_session_for_display (GdmManager *manage + static void start_user_session (GdmManager *manager, + StartUserSessionOperation *operation); +static void remove_user_session (GdmManager *manager, GdmSession *session); + static gpointer manager_object = NULL; static void manager_interface_init (GdmDBusManagerIface *interface); -@@ -1366,19 +1368,26 @@ on_start_user_session (StartUserSessionO +@@ -1961,19 +1963,26 @@ on_start_user_session (StartUserSessionOperation *operation) */ migrated = switch_to_compatible_user_session (operation->manager, operation->session, fail_if_already_switched); @@ -72,14 +82,14 @@ - display = get_display_for_user_session (operation->session); - + g_object_get (G_OBJECT (display), "doing-initial-setup", &doing_initial_setup, NULL); + if (gdm_session_get_display_mode (operation->session) == GDM_SESSION_DISPLAY_MODE_REUSE_VT) { - /* In this case, the greeter's display is morphing into - * the user session display. Kill the greeter on this session -Index: gdm3-3.12.2/daemon/gdm-server.c -=================================================================== ---- gdm3-3.12.2.orig/daemon/gdm-server.c 2014-03-19 16:15:29.000000000 +0100 -+++ gdm3-3.12.2/daemon/gdm-server.c 2014-08-14 00:40:52.525234183 +0200 -@@ -276,7 +276,11 @@ gdm_server_init_command (GdmServer *serv +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index bacc080..c9ad927 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -276,7 +276,11 @@ gdm_server_init_command (GdmServer *server) debug_options = ""; } diff -Nru gdm3-3.14.1/debian/patches/90_config_comments.patch gdm3-3.16.1.1/debian/patches/90_config_comments.patch --- gdm3-3.14.1/debian/patches/90_config_comments.patch 2014-04-26 16:34:06.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/90_config_comments.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,8 +1,16 @@ -Index: gdm3-3.12.1/data/gdm.conf-custom.in -=================================================================== ---- gdm3-3.12.1.orig/data/gdm.conf-custom.in 2014-04-26 16:31:15.765365729 +0200 -+++ gdm3-3.12.1/data/gdm.conf-custom.in 2014-04-26 16:31:39.233338510 +0200 -@@ -1,14 +1,29 @@ +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 22:23:55 +0200 +Subject: 90_config_comments + +--- + data/gdm.conf-custom.in | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/data/gdm.conf-custom.in b/data/gdm.conf-custom.in +index c9e2864..3c61054 100644 +--- a/data/gdm.conf-custom.in ++++ b/data/gdm.conf-custom.in +@@ -1,6 +1,16 @@ # GDM configuration storage +# +# See /usr/share/gdm/gdm.schemas for a list of available options. @@ -16,9 +24,10 @@ +# TimedLoginEnable = true +# TimedLogin = user1 +# TimedLoginDelay = 10 + # Uncoment the line below to force the login screen to use Xorg + #WaylandEnable=false - [security] - +@@ -9,6 +19,9 @@ [xdmcp] [greeter] @@ -28,8 +37,3 @@ [chooser] - [debug] -- -+# More verbose logs -+# Additionally lets the X server dump core if it crashes -+# Enable = true diff -Nru gdm3-3.14.1/debian/patches/91_dconf_database_path.patch gdm3-3.16.1.1/debian/patches/91_dconf_database_path.patch --- gdm3-3.14.1/debian/patches/91_dconf_database_path.patch 2014-04-26 22:43:48.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/91_dconf_database_path.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,7 +1,15 @@ -Index: gdm3-3.12.1/data/dconf/gdm.in -=================================================================== ---- gdm3-3.12.1.orig/data/dconf/gdm.in 2014-04-26 21:57:26.655244579 +0200 -+++ gdm3-3.12.1/data/dconf/gdm.in 2014-04-26 21:57:26.651244601 +0200 +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 22:25:54 +0200 +Subject: 91_dconf_database_path + +--- + data/dconf/gdm.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/dconf/gdm.in b/data/dconf/gdm.in +index 4d8bf17..2118723 100644 +--- a/data/dconf/gdm.in ++++ b/data/dconf/gdm.in @@ -1,2 +1,2 @@ user-db:user -file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults diff -Nru gdm3-3.14.1/debian/patches/92_systemd_unit.patch gdm3-3.16.1.1/debian/patches/92_systemd_unit.patch --- gdm3-3.14.1/debian/patches/92_systemd_unit.patch 2014-04-27 14:44:32.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/92_systemd_unit.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,9 +1,17 @@ -Index: gdm3-3.12.1/data/gdm.service.in -=================================================================== ---- gdm3-3.12.1.orig/data/gdm.service.in 2014-04-27 14:40:14.210580120 +0200 -+++ gdm3-3.12.1/data/gdm.service.in 2014-04-27 14:43:22.350149176 +0200 -@@ -4,12 +4,15 @@ Conflicts=getty@tty@[email protected] - After=systemd-user-sessions.service getty@tty@[email protected] plymouth-quit.service +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 22:28:32 +0200 +Subject: 92_systemd_unit + +--- + data/gdm.service.in | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/data/gdm.service.in b/data/gdm.service.in +index fb0ffdc..b2855da 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -20,14 +20,16 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service + OnFailure=plymouth-quit.service [Service] -ExecStart=@sbindir@/gdm @@ -12,14 +20,15 @@ +ExecStart=@sbindir@/gdm3 +ExecReload=/bin/kill -HUP $MAINPID +ExecReload=/usr/share/gdm/generate-config + KillMode=mixed Restart=always -+RestartSec=1s IgnoreSIGPIPE=no -BusName=org.gnome.DisplayManager +# GDM is killed upon reload if BusName is set, let us forget it for now +#BusName=org.gnome.DisplayManager StandardOutput=syslog StandardError=inherit + EnvironmentFile=-@LANG_CONFIG_FILE@ - -[Install] -Alias=display-manager.service diff -Nru gdm3-3.14.1/debian/patches/93_disable_gvfs.patch gdm3-3.16.1.1/debian/patches/93_disable_gvfs.patch --- gdm3-3.14.1/debian/patches/93_disable_gvfs.patch 2014-05-06 14:43:00.000000000 +0200 +++ gdm3-3.16.1.1/debian/patches/93_disable_gvfs.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,8 +1,16 @@ -Index: gdm3-3.12.1/daemon/gdm-launch-environment.c -=================================================================== ---- gdm3-3.12.1.orig/daemon/gdm-launch-environment.c 2014-04-10 18:58:02.000000000 +0200 -+++ gdm3-3.12.1/daemon/gdm-launch-environment.c 2014-05-06 14:41:41.240647859 +0200 -@@ -288,6 +288,9 @@ +From: "Matteo F. Vescovi" <[email protected]> +Date: Fri, 5 Jun 2015 22:30:06 +0200 +Subject: 93_disable_gvfs + +--- + daemon/gdm-launch-environment.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c +index aaf7834..c1923cd 100644 +--- a/daemon/gdm-launch-environment.c ++++ b/daemon/gdm-launch-environment.c +@@ -292,6 +292,9 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment, g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); @@ -11,4 +19,4 @@ + g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup ("1")); g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm")); - if (launch_environment->priv->dbus_session_bus_address) { + return hash; diff -Nru gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch gdm3-3.16.1.1/debian/patches/94_retain_xorg_log.patch --- gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch 2014-11-08 20:57:55.000000000 +0100 +++ gdm3-3.16.1.1/debian/patches/94_retain_xorg_log.patch 2015-06-05 22:51:11.000000000 +0200 @@ -1,15 +1,21 @@ From: Simon McVittie <[email protected]> +Date: Fri, 5 Jun 2015 22:31:38 +0200 +Subject: 94_retain_xorg_log + Subject: reinstate Xorg.N.log at Xorg maintainers' request Date: Sat, 08 Nov 2014 17:10:47 +0000 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771 +Bug-Debian: https://bugs.debian.org/765771 Forwarded: no +--- + daemon/gdm-server.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index ccb26a3..537f9db 100644 +index c9ad927..3daf3df 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c -@@ -299,12 +299,14 @@ gdm_server_init_command (GdmServer *server) +@@ -303,12 +303,14 @@ gdm_server_init_command (GdmServer *server) } #ifdef ENABLE_SYSTEMD_JOURNAL
signature.asc
Description: Digital signature
