Bug#775914: unblock (pre-approval): mate-session-manager/1.8.1-7
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking of planned upload of package mate-session-manager
+ * debian/patches:
-> Two more patches from upstream should arrive in Debian jessie.
+ + Add 0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch.
+ Follow-up patch for previously added dconf switch that handles
+ gnome-keyring and smproxy compat mode (see: #775198). (Closes:
+ #775571).
-> This fixes #775571, a follow-up bug of #775198 (which got fixed in
1.8.1-6). Quoting from the current bug report:
"""
The patch introduced by #775189 to allow users to disable gnome-keyring
integration has a logic issue and leads to only *one* of the components
to be initialized (in order, `smproxy`, then `keyring`). This means
that with the default list of `['keyring', 'smproxy']`, only the
`smproxy` component will get initialized.
In practice it breaks the keyring, including gpg-agent and ssh-agent.
The patch provided via #775571 got immediately applied upstream.
"""
+ + Add 0003_set-XDG_CURRENT-DESKTOP-if-empty.patch. Make sure that
+ XDG_CURRENT_DESKTOP gets set if not already set by DM. (Closes:
+ #775905).
LightDM and KDM (not tested with other DMs) don't set the
XDG_CURRENT_DESKTOP env var (which is used in GLib 2.42 internally) if
"Default Xsession" or "default" is used as session at login time. Thus,
applications that depend on XDG_CURRENT_DESKTOP being set to "MATE" fail.
light+love,
Mike
unblock mate-session-manager/1.8.1-7
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru mate-session-manager-1.8.1/debian/changelog mate-session-manager-1.8.1/debian/changelog
--- mate-session-manager-1.8.1/debian/changelog 2015-01-21 14:15:18.000000000 +0100
+++ mate-session-manager-1.8.1/debian/changelog 2015-01-21 14:12:37.000000000 +0100
@@ -1,3 +1,16 @@
+mate-session-manager (1.8.1-7) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch.
+ Follow-up patch for previously added dconf switch that handles
+ gnome-keyring and smproxy compat mode (see: #775198). (Closes:
+ #775571).
+ + Add 0003_set-XDG_CURRENT-DESKTOP-if-empty.patch. Make sure that
+ XDG_CURRENT_DESKTOP gets set if not already set by DM. (Closes:
+ #775905).
+
+ -- Mike Gabriel <sunweaver@debian.org> Wed, 21 Jan 2015 14:11:56 +0100
+
mate-session-manager (1.8.1-6) unstable; urgency=medium
* debian/patches:
diff -Nru mate-session-manager-1.8.1/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch mate-session-manager-1.8.1/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
--- mate-session-manager-1.8.1/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch 1970-01-01 01:00:00.000000000 +0100
+++ mate-session-manager-1.8.1/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch 2015-01-21 12:49:43.000000000 +0100
@@ -0,0 +1,65 @@
+From 47049eaad4650307650b904b3c44a8f1650bc49e Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <lists.ban@herbesfolles.org>
+Date: Tue, 20 Jan 2015 17:45:34 +0000
+Subject: MsmGnome: Fix and simplify logic
+
+---
+--- a/mate-session/msm-gnome.c
++++ b/mate-session/msm-gnome.c
+@@ -237,8 +237,6 @@
+ {
+ GSettings* settings;
+ gchar **array;
+- GList *startup = NULL;
+- gint i;
+
+ if (gnome_compat_started == TRUE)
+ return;
+@@ -246,32 +244,26 @@
+ settings = g_settings_new (GSM_SCHEMA);
+ array = g_settings_get_strv (settings, GSM_GNOME_COMPAT_STARTUP_KEY);
+ if (array) {
+- for (i = 0; array[i]; i++) {
+- startup = g_list_append (startup, g_strdup (array[i]));
+- }
+- }
+- g_strfreev (array);
+- g_object_unref (settings);
++ guint i;
+
+- if (startup != NULL) {
+- if (g_list_find_custom (startup, "smproxy", (GCompareFunc) strcmp) != NULL) {
+- g_debug ("MsmGnome: starting smproxy");
+- msm_compat_gnome_smproxy_startup ();
+- gnome_compat_started = TRUE;
+- } else if (g_list_find_custom (startup, "keyring", (GCompareFunc) strcmp) != NULL) {
+- g_debug ("MsmGnome: starting keyring");
+- gnome_keyring_daemon_startup ();
+- gnome_compat_started = TRUE;
+- } else {
+- g_debug ("MsmGnome: unknown component, ignoring");
++ for (i = 0; array[i]; i++) {
++ if (strcmp (array[i], "smproxy") == 0) {
++ g_debug ("MsmGnome: starting smproxy");
++ msm_compat_gnome_smproxy_startup ();
++ gnome_compat_started = TRUE;
++ } else if (strcmp (array[i], "keyring") == 0) {
++ g_debug ("MsmGnome: starting keyring");
++ gnome_keyring_daemon_startup ();
++ gnome_compat_started = TRUE;
++ } else {
++ g_debug ("MsmGnome: ignoring unknown component \"%s\"", array[i]);
++ }
+ }
+-
+- g_list_foreach (startup, (GFunc) g_free, NULL);
+- g_list_free (startup);
+-
++ g_strfreev (array);
+ } else {
+ g_debug ("MsmGnome: No components found to start");
+ }
++ g_object_unref (settings);
+ }
+
+
diff -Nru mate-session-manager-1.8.1/debian/patches/0003_set-XDG_CURRENT-DESKTOP-if-empty.patch mate-session-manager-1.8.1/debian/patches/0003_set-XDG_CURRENT-DESKTOP-if-empty.patch
--- mate-session-manager-1.8.1/debian/patches/0003_set-XDG_CURRENT-DESKTOP-if-empty.patch 1970-01-01 01:00:00.000000000 +0100
+++ mate-session-manager-1.8.1/debian/patches/0003_set-XDG_CURRENT-DESKTOP-if-empty.patch 2015-01-21 14:08:01.000000000 +0100
@@ -0,0 +1,22 @@
+From ca95cd34c5c6f9f9e5873b4732338e23c30988e8 Mon Sep 17 00:00:00 2001
+From: Denis Gorodnichev <denis.gorodnichev@gmail.com>
+Date: Mon, 29 Sep 2014 04:44:00 +0000
+Subject: Set XDG_CURRENT_DESKTOP if unset
+
+XDG_CURRENT_DESKTOP is used by glib >= 2.42 at g_desktop_app_info* functions
+
+Original GNOME commit: https://git.gnome.org/browse/gnome-session/commit/?id=1db085ce7e5197b28ab24a3ec54d888efe98fcb4
+Closes https://github.com/mate-desktop/mate-session-manager/pull/62
+---
+--- a/mate-session/main.c
++++ b/mate-session/main.c
+@@ -581,6 +581,9 @@
+ mdm_log_init();
+ mdm_log_set_debug(debug);
+
++ if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
++ gsm_util_setenv ("XDG_CURRENT_DESKTOP", "MATE");
++
+ /* Set DISPLAY explicitly for all our children, in case --display
+ * was specified on the command line.
+ */
diff -Nru mate-session-manager-1.8.1/debian/patches/series mate-session-manager-1.8.1/debian/patches/series
--- mate-session-manager-1.8.1/debian/patches/series 2015-01-21 14:15:23.000000000 +0100
+++ mate-session-manager-1.8.1/debian/patches/series 2015-01-21 12:49:43.000000000 +0100
@@ -1,2 +1,4 @@
0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
+0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
+0003_set-XDG_CURRENT-DESKTOP-if-empty.patch
1001_hypen-used-as-minus-sign-man-page-fix.patch
Reply to: