[Pkg-xfce-commits] r4778 - in desktop/branches/lenny-backports/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Jan 4 07:29:22 UTC 2011
Author: corsac
Date: 2011-01-04 07:29:15 +0000 (Tue, 04 Jan 2011)
New Revision: 4778
Added:
desktop/branches/lenny-backports/xfce4-session/debian/patches/03_gk-start-with-path.patch
desktop/branches/lenny-backports/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
Modified:
desktop/branches/lenny-backports/xfce4-session/debian/changelog
desktop/branches/lenny-backports/xfce4-session/debian/control
desktop/branches/lenny-backports/xfce4-session/debian/patches/series
Log:
merge changes from latest version in squeeze
Modified: desktop/branches/lenny-backports/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/changelog 2011-01-04 07:28:18 UTC (rev 4777)
+++ desktop/branches/lenny-backports/xfce4-session/debian/changelog 2011-01-04 07:29:15 UTC (rev 4778)
@@ -1,9 +1,28 @@
-xfce4-session (4.6.2-1~bpo50+1) lenny-backports; urgency=low
+xfce4-session (4.6.2-3~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 17 Aug 2010 20:54:58 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 04 Jan 2011 08:22:55 +0100
+xfce4-session (4.6.2-3) unstable; urgency=low
+
+ * debian/control:
+ - add consolekit to Recommends for system
+ shutdown/reboot/suspend/hibernate.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 13 Nov 2010 14:09:51 +0100
+
+xfce4-session (4.6.2-2) unstable; urgency=low
+
+ * debian/patches:
+ - 03_gk-start-with-path and 04_gk-dont-check-running-use-start added,
+ change the way it starts gnome-keyring so it correctly runs in the
+ session and exports environment variables. closes: #523322
+ * debian/control
+ - update standards version to 3.9.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Sep 2010 18:42:53 +0200
+
xfce4-session (4.6.2-1) unstable; urgency=low
[Stefan Ott]
* debian/watch edited to track Xfce archive reorganisation.
Modified: desktop/branches/lenny-backports/xfce4-session/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/control 2011-01-04 07:28:18 UTC (rev 4777)
+++ desktop/branches/lenny-backports/xfce4-session/debian/control 2011-01-04 07:29:15 UTC (rev 4778)
@@ -8,7 +8,7 @@
libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev,
x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev,
intltool (>= 0.31)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
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/
@@ -17,7 +17,7 @@
Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, fortune-mod, xfce4-settings, xfconf
-Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11, x11-xserver-utils
+Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, consolekit, dbus-x11, x11-xserver-utils
Suggests: sudo
Provides: x-session-manager
Description: Xfce4 Session Manager
Copied: desktop/branches/lenny-backports/xfce4-session/debian/patches/03_gk-start-with-path.patch (from rev 4776, desktop/trunk/xfce4-session/debian/patches/03_gk-start-with-path.patch)
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/patches/03_gk-start-with-path.patch (rev 0)
+++ desktop/branches/lenny-backports/xfce4-session/debian/patches/03_gk-start-with-path.patch 2011-01-04 07:29:15 UTC (rev 4778)
@@ -0,0 +1,12 @@
+--- a/xfce4-session/xfsm-compat-gnome.c
++++ b/xfce4-session/xfsm-compat-gnome.c
+@@ -128,7 +128,8 @@
+ error = NULL;
+ argv[0] = GNOME_KEYRING_DAEMON;
+ argv[1] = NULL;
+- g_spawn_sync (NULL, argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
++ g_spawn_sync (NULL, argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ child_setup, NULL,
+ &sout, NULL, &status, &error);
+
Copied: desktop/branches/lenny-backports/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch (from rev 4776, desktop/trunk/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch)
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch (rev 0)
+++ desktop/branches/lenny-backports/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch 2011-01-04 07:29:15 UTC (rev 4778)
@@ -0,0 +1,79 @@
+Index: xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c
+===================================================================
+--- xfce4-session-4.6.2.orig/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:36:01.988123134 +0200
++++ xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:37:08.787058601 +0200
+@@ -100,34 +100,23 @@
+ static void
+ gnome_keyring_daemon_startup (void)
+ {
+- const char *old_keyring;
+-
+ GError *error = NULL;
+ gchar *sout;
+ gchar **lines;
++ gsize lineno;
+ gint status;
+ long pid;
+ gchar *pid_str;
+ gchar *end;
+- char *argv[2];
+-
+- /* If there is already a working keyring, don't start a new daemon */
+- old_keyring = g_getenv ("GNOME_KEYRING_SOCKET");
+- if (old_keyring != NULL && access (old_keyring, R_OK | W_OK) == 0)
+- {
+-#ifdef HAVE_GNOME_KEYRING
+- gnome_keyring_daemon_prepare_environment_sync ();
+-#endif
+- return;
+- }
+-
++ char *argv[3];
+
+ /* Pipe to slave keyring lifetime to */
+ pipe (keyring_lifetime_pipe);
+
+ error = NULL;
+ argv[0] = GNOME_KEYRING_DAEMON;
+- argv[1] = NULL;
++ argv[1] = "--start";
++ argv[2] = NULL;
+ g_spawn_sync (NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ child_setup, NULL,
+@@ -147,20 +136,22 @@
+ {
+ if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
+ {
+- lines = g_strsplit (sout, "\n", 3);
++ lines = g_strsplit (sout, "\n", 0);
+
+- if (lines[0] != NULL && lines[1] != NULL
+- && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID="))
+- {
+- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID=");
+- pid = strtol (pid_str, &end, 10);
+-
+- if (end != pid_str)
+- {
+- gnome_keyring_daemon_pid = pid;
+- xfce_putenv (lines[0]);
+- }
+- }
++ for (lineno = 0; lines[lineno] != NULL; lineno++)
++ {
++ xfce_putenv (lines[lineno]);
++
++ if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID="))
++ {
++ pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID=");
++ pid = strtol (pid_str, &end, 10);
++ if (end != pid_str)
++ {
++ gnome_keyring_daemon_pid = pid;
++ }
++ }
++ }
+
+ g_strfreev (lines);
+
Modified: desktop/branches/lenny-backports/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/patches/series 2011-01-04 07:28:18 UTC (rev 4777)
+++ desktop/branches/lenny-backports/xfce4-session/debian/patches/series 2011-01-04 07:29:15 UTC (rev 4778)
@@ -1,2 +1,4 @@
01_correct_shadows.patch
02_fix-fortune-path.patch
+03_gk-start-with-path.patch
+04_gk-dont-check-running-use-start.patch
More information about the Pkg-xfce-commits
mailing list