diffstat of debian/ for xfce4-session_4.10.0-2 xfce4-session_4.10.1-SprezzOS1 changelog | 12 control | 6 patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch | 151 ---------- patches/series | 1 rules | 3 5 files changed, 18 insertions(+), 155 deletions(-) --- xfce4-session-4.10.0/debian/changelog 2012-10-13 13:42:10.000000000 +0000 +++ xfce4-session-4.10.1/debian/changelog 2013-05-06 09:54:16.000000000 +0000 @@ -1,3 +1,15 @@ +xfce4-session (4.10.1-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Mon, 06 May 2013 05:47:00 -0400 + +xfce4-session (4.10.0-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Mon, 07 Jan 2013 03:11:26 -0500 + xfce4-session (4.10.0-2) experimental; urgency=low * debian/control: --- xfce4-session-4.10.0/debian/control 2012-08-05 08:46:57.000000000 +0000 +++ xfce4-session-4.10.1/debian/control 2013-05-06 09:54:16.000000000 +0000 @@ -1,14 +1,14 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers -Uploaders: Yves-Alexis Perez , Lionel Le Folgoc +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian Xfce Maintainers Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libwnck-dev, x11-xserver-utils, libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31), dpkg-dev (>= 1.16.1) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.xfce.org/ Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/ --- xfce4-session-4.10.0/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 2012-09-02 12:48:02.000000000 +0000 +++ xfce4-session-4.10.1/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001 -From: Dimitar Zhekov -Date: Thu, 30 Aug 2012 22:52:14 +0200 -Subject: [PATCH] Handle multiple interactive session save (bug #5379). - -Additionnaly, we now use SmSaveGlobal on log out / shutdown without -session save which avoids data loss. Previously clients would not save -anything on log out without session save. - -Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com). ---- - xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++------------------ - 1 file changed, 47 insertions(+), 34 deletions(-) - -diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c -index bf6a446..35811c5 100644 ---- a/xfce4-session/xfsm-manager.c -+++ b/xfce4-session/xfsm-manager.c -@@ -98,6 +98,7 @@ struct _XfsmManager - - XfsmShutdownType shutdown_type; - XfsmShutdown *shutdown_helper; -+ gboolean save_session; - - gboolean session_chooser; - gchar *session_name; -@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager) - manager->failsafe_mode = TRUE; - manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; - manager->shutdown_helper = xfsm_shutdown_get (); -+ manager->save_session = TRUE; - - manager->pending_properties = g_queue_new (); - manager->starting_properties = g_queue_new (); -@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager, - XfsmClient *cl = lp->data; - if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) - { -- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); -+ /* a client is already interacting, so new client has to wait */ -+ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); -+ xfsm_manager_cancel_client_save_timeout(manager, client); - return; - } - } -@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, - } - } - -- if (!shutdown || shutdown_save) -+ /* don't save the session if shutting down without save */ -+ manager->save_session = !shutdown || shutdown_save; -+ -+ if (save_type == SmSaveBoth && !manager->save_session) - { -- xfsm_manager_set_state (manager, -- shutdown -- ? XFSM_MANAGER_SHUTDOWN -- : XFSM_MANAGER_CHECKPOINT); -+ /* saving the session, so clients should -+ * (prompt to) save the user data only */ -+ save_type = SmSaveGlobal; -+ } - -- /* handle legacy applications first! */ -- xfsm_legacy_perform_session_save (); -+ xfsm_manager_set_state (manager, -+ shutdown -+ ? XFSM_MANAGER_SHUTDOWN -+ : XFSM_MANAGER_CHECKPOINT); - -- for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -- lp; -- lp = lp->next) -- { -- XfsmClient *client = lp->data; -- XfsmProperties *properties = xfsm_client_get_properties (client); -- const gchar *program; -+ /* handle legacy applications first! */ -+ if (manager->save_session) -+ xfsm_legacy_perform_session_save (); - -- /* xterm's session management is broken, so we won't -- * send a SAVE YOURSELF to xterms */ -- program = xfsm_properties_get_string (properties, SmProgram); -- if (program != NULL && strcasecmp (program, "xterm") == 0) -- continue; -+ for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -+ lp; -+ lp = lp->next) -+ { -+ XfsmClient *client = lp->data; -+ XfsmProperties *properties = xfsm_client_get_properties (client); -+ const gchar *program; - -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -- { -- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -- interact_style, fast); -- } -+ /* xterm's session management is broken, so we won't -+ * send a SAVE YOURSELF to xterms */ -+ program = xfsm_properties_get_string (properties, SmProgram); -+ if (program != NULL && strcasecmp (program, "xterm") == 0) -+ continue; - -- xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -- xfsm_manager_start_client_save_timeout (manager, client); -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ { -+ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -+ interact_style, fast); - } -- } -- else -- { -- /* shutdown session without saving */ -- xfsm_manager_perform_shutdown (manager); -+ -+ xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -+ xfsm_manager_start_client_save_timeout (manager, client); - } - } - -@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager, - XfsmClient *client, - gboolean success) - { -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in -+ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone -+ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */ -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && -+ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL && -+ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT) - { - xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " - "in save mode. Prepare to be nuked!\n", -@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager) - xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); - - /* all clients done, store session data */ -- xfsm_manager_store_session (manager); -+ if (manager->save_session) -+ xfsm_manager_store_session (manager); - - if (manager->state == XFSM_MANAGER_CHECKPOINT) - { --- -1.7.10.4 - --- xfce4-session-4.10.0/debian/patches/series 2012-09-02 12:48:02.000000000 +0000 +++ xfce4-session-4.10.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-Handle-multiple-interactive-session-save-bug-5379.patch --- xfce4-session-4.10.0/debian/rules 2012-04-08 20:05:04.000000000 +0000 +++ xfce4-session-4.10.1/debian/rules 2013-05-06 09:54:16.000000000 +0000 @@ -3,6 +3,9 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow +override_dh_auto_configure: + dh_auto_configure -- --enable-libgnome-keyring + override_dh_install: chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc dh_install --fail-missing -X .la