diff -Nru gnome-session-3.4.2.1/debian/changelog gnome-session-3.4.2.1/debian/changelog --- gnome-session-3.4.2.1/debian/changelog 2012-09-29 10:19:24.000000000 +0200 +++ gnome-session-3.4.2.1/debian/changelog 2013-04-07 19:17:58.000000000 +0200 @@ -1,3 +1,14 @@ +gnome-session (3.4.2.1-4) UNRELEASED; urgency=low + + * debian/patches/20_add_app_start_dir.patch: + + New patch. Add a new command line option, --start , to + specify a directory to load .desktop files from. This differs + from --autostart in that the latter overrides session loading + while the new option doesn't. This is necessary for gdm3 to be + able to start a11y tools. + + -- Emilio Pozuelo Monfort Sun, 07 Apr 2013 19:11:12 +0200 + gnome-session (3.4.2.1-3) unstable; urgency=low * defaults.list: diff -Nru gnome-session-3.4.2.1/debian/control gnome-session-3.4.2.1/debian/control --- gnome-session-3.4.2.1/debian/control 2012-09-29 10:19:58.000000000 +0200 +++ gnome-session-3.4.2.1/debian/control 2013-04-07 20:12:06.000000000 +0200 @@ -7,7 +7,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Josselin Mouette , Michael Biebl +Uploaders: Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl Standards-Version: 3.9.3 Build-Depends: cdbs (>= 0.4.41), dh-autoreconf, diff -Nru gnome-session-3.4.2.1/debian/patches/20_add_app_start_dir.patch gnome-session-3.4.2.1/debian/patches/20_add_app_start_dir.patch --- gnome-session-3.4.2.1/debian/patches/20_add_app_start_dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ gnome-session-3.4.2.1/debian/patches/20_add_app_start_dir.patch 2013-04-07 19:17:58.000000000 +0200 @@ -0,0 +1,54 @@ +--- a/gnome-session/gsm-session-fill.c ++++ b/gnome-session/gsm-session-fill.c +@@ -462,6 +462,7 @@ + + gboolean + gsm_session_fill (GsmManager *manager, ++ char *autostart_dir, + char **override_autostart_dirs, + const char *session) + { +@@ -469,6 +470,11 @@ + gboolean is_fallback; + char *actual_session; + ++ /* This doesn't override the loading of a .session file, ++ * so we don't return here. */ ++ if (autostart_dir != NULL) ++ gsm_manager_add_autostart_apps_from_dir (manager, autostart_dir); ++ + if (override_autostart_dirs != NULL) { + load_override_apps (manager, override_autostart_dirs); + return TRUE; +--- a/gnome-session/gsm-session-fill.h ++++ b/gnome-session/gsm-session-fill.h +@@ -27,6 +27,7 @@ + G_BEGIN_DECLS + + gboolean gsm_session_fill (GsmManager *manager, ++ char *autostart_dir, + char **override_autostart_dirs, + const char *session); + +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -272,9 +272,11 @@ + GsmXsmpServer *xsmp_server; + GdmSignalHandler *signal_handler; + static char **override_autostart_dirs = NULL; ++ static char *autostart_dir = NULL; + static char *session_name = NULL; + static GOptionEntry entries[] = { + { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), N_("AUTOSTART_DIR") }, ++ { "start", 0, 0, G_OPTION_ARG_STRING, &autostart_dir, N_("Directory to load apps from in addition to the session"), NULL }, + { "session", 0, 0, G_OPTION_ARG_STRING, &session_name, N_("Session to use"), N_("SESSION_NAME") }, + { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL }, + { "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL }, +@@ -355,6 +357,7 @@ + session_name = _gsm_manager_get_default_session (manager); + + if (!gsm_session_fill (manager, ++ autostart_dir, + override_autostart_dirs, + session_name)) { + gsm_util_init_error (TRUE, "Failed to load session \"%s\"", session_name ? session_name : "(null)"); diff -Nru gnome-session-3.4.2.1/debian/patches/series gnome-session-3.4.2.1/debian/patches/series --- gnome-session-3.4.2.1/debian/patches/series 2012-09-11 22:51:53.000000000 +0200 +++ gnome-session-3.4.2.1/debian/patches/series 2013-04-07 19:17:58.000000000 +0200 @@ -6,3 +6,4 @@ 12_no_gdm_fallback.patch 13_display_session_properties.patch 14_hide_session_properties_help.patch +20_add_app_start_dir.patch