[Pkg-xfce-commits] r7430 - in desktop/trunk/xfce4-session: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 09:09:21 UTC 2013
Author: corsac
Date: 2013-05-21 21:09:21 +0000 (Tue, 21 May 2013)
New Revision: 7430
Added:
desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch
desktop/trunk/xfce4-session/debian/startxfce4.1
Removed:
desktop/trunk/xfce4-session/debian/debian-tips
desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
desktop/trunk/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
desktop/trunk/xfce4-session/debian/xfce4-tips.1
Modified:
desktop/trunk/xfce4-session/
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/control
desktop/trunk/xfce4-session/debian/manpages
desktop/trunk/xfce4-session/debian/patches/series
desktop/trunk/xfce4-session/debian/rules
desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
Log:
merge changes from experimental
Property changes on: desktop/trunk/xfce4-session
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/xfce4-session:6602-7429
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/changelog 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,3 +1,76 @@
+xfce4-session (4.10.0-2) experimental; urgency=low
+
+ * debian/control:
+ - recommends xscreensaver. closes: 3683865
+ * debian/patches:
+ - 0001-Handle-multiple-interactive-session-save-bug-5379 added, fix broken
+ session in some cases. closes: #632404
+ * debian/xfce4-session.lintian-overrides updated, we do use hardening flags.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 13 Oct 2012 15:42:09 +0200
+
+xfce4-session (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 13:44:46 +0200
+
+xfce4-session (4.9.2-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 22 Apr 2012 14:31:11 +0200
+
+xfce4-session (4.9.1-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Apr 2012 16:00:33 +0200
+
+xfce4-session (4.9.0-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/patches:
+ - 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
+ ('--force' has been changed to '--replace').
+ - 06_no-settings-helper-in-490.patch: added, do not launch x-s-h.
+ - series: refreshed.
+ * debian/control:
+ - drop xfce4-dev-tools, libtool and xfce4-panel-dev from Build-Depends.
+ - bump xfce4-settings' dep to >= 4.9.0.
+ - drop xfce4-utils and ${shlibs:Recommends} from Recommends.
+ * debian/rules:
+ - clean up, no need to run xdt-autogen.
+ - tell dh_install to ignore .la files.
+ - drop overrides for shlibdeps and makeshlibs, the panel plugin isn't
+ built anymore.
+ * debian/xfce4-tips.1: dropped.
+ * debian/startxfce4.1: added, stolen from xfce4-utils.
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/control:
+ - bump build-deps for 4.9.
+ - update standards version to 3.9.3.
+ - drop fortunes-mod build-dep since xfce4-tip is gone.
+ - make xfce4-session break/replace xfce4-utils since it ships the xinitrc
+ script now.
+ - drop suggestions of fortunes-mode and sudo.
+ * debian/patches:
+ - 02_fix-fortune-path, 03_respect-save-settings-logout-plugin,
+ 04_fix-missing-lm, 05_force-xfsettingsd-start,
+ 06_no-settings-helper-in-490 dropped, not needed anymore.
+ * debian/rules:
+ - drop chrpath call.
+ - drop strfile call.
+ - fix permissions on xinitrc.
+ - build with --parallel.
+ * debian/debian-tips dropped, there's no tips anymore.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 22:05:11 +0200
+
xfce4-session (4.8.3-4) unstable; urgency=low
* debian/patches:
Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/control 2013-05-21 21:09:21 UTC (rev 7430)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, chrpath,
- fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
- libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libwnck-dev,
- x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev,
- intltool (>= 0.31), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool
+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
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
@@ -16,10 +16,12 @@
Package: xfce4-session
Section: xfce
Architecture: any
+Breaks: xfce4-utils
+Replaces: xfce4-utils
Pre-Depends: ${misc:Pre-Depends}, multiarch-support
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf
-Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
- dbus-x11, x11-xserver-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.10.0), xfconf
+Recommends: xfwm4, xfdesktop4, consolekit, upower, dbus-x11, x11-xserver-utils,
+ xscreensaver
Suggests: sudo, fortunes-mod
Provides: x-session-manager
Description: Xfce4 Session Manager
Deleted: desktop/trunk/xfce4-session/debian/debian-tips
===================================================================
--- desktop/trunk/xfce4-session/debian/debian-tips 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/debian-tips 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,8 +0,0 @@
-The Debian Xfce packages you're using right now are brought to you by the
-Debian Xfce Group.
-
-See http://pkg-xfce.alioth.debian.org for more information.
-%
-On Debian systems you can get a selection of panel plugins installing the
-xfce4-goodies package.
-%
Modified: desktop/trunk/xfce4-session/debian/manpages
===================================================================
--- desktop/trunk/xfce4-session/debian/manpages 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/manpages 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,2 +1 @@
-debian/xfce4-tips.1
-debian/xfce4-session-settings.1
+debian/*.1
Copied: desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch (from rev 7429, desktop/branches/experimental/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch)
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 21:09:21 UTC (rev 7430)
@@ -0,0 +1,151 @@
+From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001
+From: Dimitar Zhekov <hamster at mbox.contact.bg>
+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 at 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
+
Deleted: desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-tips/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-tips/main.c 2011-09-13 18:17:10.000000000 +0200
-+++ xfce4-session-4.8.2/xfce4-tips/main.c 2011-09-13 23:21:51.882831214 +0200
-@@ -274,7 +274,7 @@
- channel = xfconf_channel_get ("xfce4-tips");
-
- /* test for fortune */
-- fortune_cmd = g_find_program_in_path ("fortune");
-+ fortune_cmd = g_find_program_in_path ("/usr/games/fortune");
-
- read_tips_from_file ();
-
Deleted: desktop/trunk/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,74 +0,0 @@
-From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at lefolgoc.net>
-Date: Thu, 25 Aug 2011 14:22:24 +0200
-Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
-
-Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
-logout panel plugin as well.
-
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7915
----
- panel-plugin/Makefile.am | 2 ++
- panel-plugin/xfsm-logout-plugin.c | 14 +++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 0675e2e..fd0609b 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
- libxfsm_logout_plugin_la_CFLAGS = \
- $(LIBX11_CFLAGS) \
- $(LIBXFCE4PANEL_CFLAGS) \
-+ $(XFCONF_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(GTK_CFLAGS) \
-@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
- libxfsm_logout_plugin_la_LIBADD = \
- $(LIBX11_LIBS) \
- $(LIBXFCE4PANEL_LIBS) \
-+ $(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
- $(GTK_LIBS) \
-diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
-index b8e25ab..12dec0f 100644
---- a/panel-plugin/xfsm-logout-plugin.c
-+++ b/panel-plugin/xfsm-logout-plugin.c
-@@ -43,6 +43,7 @@
-
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
-+#include <xfconf/xfconf.h>
- #include <libxfce4panel/libxfce4panel.h>
-
- #include "xfsm-logout-plugin-ui.h"
-@@ -207,12 +208,23 @@ static void
- xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
- XfsmShutdownType type)
- {
-+ GError *error = NULL;
-+ XfconfChannel *channel;
- gint resp = GTK_RESPONSE_ACCEPT;
-
- g_return_if_fail(logout_plugin != NULL);
- g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
-
-- logout_plugin->allow_save = TRUE;
-+ if (G_UNLIKELY (!xfconf_init (&error))) {
-+ g_warning ("Unable to contact settings server: %s", error->message);
-+ g_error_free (error);
-+ logout_plugin->allow_save = TRUE;
-+ }
-+ else {
-+ channel = xfconf_channel_get ("xfce4-session");
-+ logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
-+ xfconf_shutdown ();
-+ }
-
- if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
- GtkWidget *dialog, *topvbox, *hbox, *image, *label;
---
-1.7.2.5
-
Deleted: desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,45 +0,0 @@
-commit eeaea26d3b777afb98c21317ad83170e3f725fd0
-Author: Brian J. Tarricone <brian at tarricone.org>
-Date: Mon Sep 26 01:18:48 2011 -0700
-
- explicitly link to libm where needed (bug #7953)
-
- we use rint() but aren't linking to libm; probably getting picked up
- implicitly by a dependency like libpng, which recently dropped that flag
- from its .pc file.
-
- Patch slightly updated for Debian to apply cleanly: changes to configure.in.in
- are made to configure.in instead.
-
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7953
-Origin: backport, http://git.xfce.org/xfce/xfce4-session/commit/?id=eeaea26d3b777afb98c21317ad83170e3f725fd0
-
-diff --git a/configure.in b/configure.in
-index 141d427..8eff947 100644
---- a/configure.in
-+++ b/configure.in
-@@ -63,6 +63,10 @@ AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
- AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
- sigaction strdup sync vfork])
-
-+dnl Check for required libraries
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl Check for X11 installed
- XDT_CHECK_LIBX11_REQUIRE()
-
-diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
-index 96ae5c5..d049a35 100644
---- a/engines/balou/Makefile.am
-+++ b/engines/balou/Makefile.am
-@@ -31,7 +31,8 @@ libbalou_la_LDFLAGS = \
- libbalou_la_LIBADD = \
- $(top_builddir)/libxfsm/libxfsm-4.6.la \
- $(LIBXFCE4UI_LIBS) \
-- $(XFCONF_LIBS)
-+ $(XFCONF_LIBS) \
-+ $(LIBM)
-
-
- libbalou_la_DEPENDENCIES = \
Deleted: desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-session/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-session/main.c 2011-09-13 23:21:54.690846909 +0200
-+++ xfce4-session-4.8.2/xfce4-session/main.c 2011-09-13 23:21:58.626868935 +0200
-@@ -144,7 +144,7 @@
- sm_init (channel, disable_tcp, manager);
-
- /* start xfsettingsd */
-- if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
-+ if ( !g_spawn_command_line_async ("xfsettingsd --force", NULL))
- {
- g_warning ("Could not start xfsettingsd");
- }
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/patches/series 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,6 +1 @@
-02_fix-fortune-path.patch
-03_respect-save-settings-logout-plugin.patch
-04_fix-missing-lm.patch
-05_force-xfsettingsd-start.patch
-06-Handle-multiple-interactive-session-save-bug-5379.patch
-07-Store-the-watch-function-id-to-avoid-possible-double.patch
+0001-Handle-multiple-interactive-session-save-bug-5379.patch
Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/rules 2013-05-21 21:09:21 UTC (rev 7430)
@@ -3,40 +3,12 @@
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:
- NOCONFIGURE=1 xdt-autogen
- dh_auto_configure
- find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-
-override_dh_auto_clean:
- rm -f po/POTFILES.skip
- dh_auto_clean
-
override_dh_install:
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.*a
-
- chrpath -d -k debian/tmp/usr/bin/* \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/xfsm-shutdown-helper \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*so \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so
-
- cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
- strfile debian/tmp/usr/share/xfce4/tips/tips \
- debian/tmp/usr/share/xfce4/tips/tips.dat
- rm -f debian/tmp/etc/xdg/autostart/xfce4-tips-autostart.desktop
- dh_install --fail-missing
+ chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc
+ dh_install --fail-missing -X .la
-override_dh_shlibdeps:
- dh_shlibdeps -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
- -dRecommends debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
-
-override_dh_makeshlibs:
- dh_makeshlibs -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so
-
override_dh_strip:
dh_strip --dbg-package=xfce4-session-dbg
%:
- dh $@
+ dh $@ --parallel
Copied: desktop/trunk/xfce4-session/debian/startxfce4.1 (from rev 7429, desktop/branches/experimental/xfce4-session/debian/startxfce4.1)
===================================================================
--- desktop/trunk/xfce4-session/debian/startxfce4.1 (rev 0)
+++ desktop/trunk/xfce4-session/debian/startxfce4.1 2013-05-21 21:09:21 UTC (rev 7430)
@@ -0,0 +1,41 @@
+.\" Copyright (c) 2005 Emanuele Rocca
+.TH STARTXFCE4 "1" "June 2005" "startxfce4" "User Commands"
+.SH NAME
+startxfce4 \- initialize an Xfce session
+.SH SYNOPSIS
+.B startxfce4
+.SH DESCRIPTION
+.PP
+.B startxfce4
+is a script responsible for starting an Xfce session. It runs
+.B xinit
+passing the file specified in the
+.B FILES
+subsection as an argument.
+.P
+You may want to modify the default
+.B xinitrc
+file. In order to do that, copy
+.I /etc/xdg/xfce4/xinitrc
+to
+.I ~/.config/xfce4/xinitrc
+and modify that file.
+.SH FILES
+.PP
+.IP ~/.config/xfce4/xinitrc
+User configuration file
+.IP /etc/xdg/xfce4/xinitrc
+System wide configuration file
+.SH SEE ALSO
+.PP
+.BR xfce4-session (1),
+.BR xinit (1),
+.BR dbus-launch (1),
+.BR ssh-agent (1),
+.BR file:///usr/share/xfce4/doc/C/xfce4-use.html#xfce4-getting-started
+.SH COPYRIGHT
+Copyright \(co 2005 Emanuele Rocca
+.br
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
Modified: desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,2 +1,11 @@
+# the lib is private so we won't split it
xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/*/libxfsm-4.6.so.0.0.0 usr/lib/*/libxfsm-4.6.so
xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0
+
+# we do build using hardening flags, it's a false positive
+xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/splash-engines/libbalou.so
+xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/xfsm-shutdown-helper
+
+# XFCE is a valid category, desktop-file-validate has to be updated (#671600)
+xfce4-session: desktop-entry-invalid-category XFCE usr/share/applications/xfce-session-settings.desktop
+
Property changes on: desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
___________________________________________________________________
Deleted: svn:mergeinfo
-
Deleted: desktop/trunk/xfce4-session/debian/xfce4-tips.1
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-tips.1 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/trunk/xfce4-session/debian/xfce4-tips.1 2013-05-21 21:09:21 UTC (rev 7430)
@@ -1,21 +0,0 @@
-.\" Copyright (C) 2007 Emanuele Rocca
-.TH XFCE4-TIPS "1" "January 2007" "xfce4-tips" "User Commands"
-.SH NAME
-xfce4-tips \- XFce 4 Tips
-.SH SYNOPSIS
-.B xfce4-tips
-.SH DESCRIPTION
-.PP
-This command displays some usage tips about XFce.
-.SH FILES
-.TP
-.I /usr/share/xfce4/tips/tips
-List of tips.
-.SH SEE ALSO
-Upstream documentation in /usr/share/xfce4/doc/C/index.html
-.SH COPYRIGHT
-Copyright \(co 2007 Emanuele Rocca
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
More information about the Pkg-xfce-commits
mailing list