From 207731817927b4007dc8efdad467a63463568216 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 21 Jan 2015 12:40:00 +0100 Subject: [PATCH] debian/patches: 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). --- ...003_set-XDG-CURRENT-DESKTOP-if-empty.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch diff --git a/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch b/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch new file mode 100644 index 0000000..54940e4 --- /dev/null +++ b/debian/patches/0003_set-XDG-CURRENT-DESKTOP-if-empty.patch @@ -0,0 +1,22 @@ +From ca95cd34c5c6f9f9e5873b4732338e23c30988e8 Mon Sep 17 00:00:00 2001 +From: Denis Gorodnichev +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 --git a/debian/patches/series b/debian/patches/series index 4783a6b..5458d83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +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