[Pkg-xfce-commits] r5938 - in desktop/branches/experimental/xfce4-session/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Thu Aug 18 11:48:06 UTC 2011 

Author: mrpouit-guest
Date: 2011-08-18 11:48:05 +0000 (Thu, 18 Aug 2011)
New Revision: 5938

Added:
   desktop/branches/experimental/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch
   desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
Modified:
   desktop/branches/experimental/xfce4-session/debian/README.Debian
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/control
   desktop/branches/experimental/xfce4-session/debian/patches/series
   desktop/branches/experimental/xfce4-session/debian/postinst
Log:
* debian/README.Debian updated
  - mention LightDM.
  - fix path for xfsm-shutdown-helper.                        closes: #637197
* debian/patches/05_force-xfsettingsd-start.patch: updated for xfce4-settings
  4.9.0 ('--force' has been changed to '--replace').
* debian/control: bump xfce4-settings' dep to >= 4.9.0.
* debian/patches:
  - 03_dont-die-on-dbus-disconnect added, fix crash when dbus is restarted.
                                                              closes: #627888
* Upload to unstable. 
* debian/control:
  - drop Emanuele and Simon from Uploaders, thanks to them.
  - update standards version to 3.9.2.
* debian/patches:
  - 05_force-xfsettingsd-start added, force xfsettingsd to start.
* debian/postinst:
  - lower x-session-manager priority so startxfce4 takes precedence.

Modified: desktop/branches/experimental/xfce4-session/debian/README.Debian
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/README.Debian	2011-08-18 11:30:30 UTC (rev 5937)
+++ desktop/branches/experimental/xfce4-session/debian/README.Debian	2011-08-18 11:48:05 UTC (rev 5938)
@@ -1,7 +1,8 @@
 Running Xfce
 ------------
 
-If use you a login manager like GDM, you may have two ways to start Xfce :
+If use you a login manager like GDM or LightDM, you may have two ways to start
+Xfce :
 
 - “Xfce Session” will run a complete xfce session, using Xfce-provided
   scripts (/usr/bin/startxfce4 which will then run /etc/xdg/xfce4/xinitrc
@@ -9,10 +10,8 @@
 - “Default session” will run whatever is the default session manager on
   your system. This is the /usr/bin/x-session-manager alternatives, meaning
   you can tune it with update-alternatives (8). If you only have Xfce
-  installed on your system, it will default to xfce4-session, meaning
-  you'll be able to have an Xfce running chosing that option, but it'll be a
-  minimal one because all the preparation made in /etc/xdg/xfce4/xinitrc
-  before running xfce4-session won't be done.
+  installed on your system, it will default to startxfce4, which will run the
+  complete Xfce desktop environment.
 
 If you don't use a login manager but start Xfce from console, you need to
 take care of few stuff:
@@ -22,18 +21,17 @@
 
 This is because Debian now uses PolicyKit/ConsoleKit to manage policies for
 things like device and power management. If you run Xfce from a compatible
-display manager (gdm and kdm), they'll talk to consolekit so your X session
-will have the authentication tokens, but if you use startx, it won't.
+display manager (like gdm or lightdm), they'll talk to consolekit so your X
+session will have the authentication tokens, but if you use startx, it won't.
 There's a script shipped by default with ConsoleKit which will do that, in
-/etc/X11/Xsession.d/90consolekit, but the /etc/X11/Xsession.d/ scripts are
-only executed if you don't use any .xinitrc. See startx (1) for more
-information.
+/etc/X11/Xsession.d/90consolekit, but the /etc/X11/Xsession.d/ scripts are only
+executed if you don't use any .xinitrc. See startx (1) for more information.
 
 Managing shutdown
 -----------------
 
 There are two ways to enable user to shutdown the computer from Xfce:
 
- - use sudo, and allow user to run /usr/sbin/xfsm-shutdown-helper in sudoers
- - use policykit and a compatible login manager (gdm is known to work,
-   startx too if you use the tips above)
+ - use sudo, and allow user to run /usr/lib/xfce4/session/xfsm-shutdown-helper
+ - use policykit and a compatible login manager (lightdm and gdm are known to
+   work, startx too if you use the tips above)

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2011-08-18 11:30:30 UTC (rev 5937)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2011-08-18 11:48:05 UTC (rev 5938)
@@ -1,3 +1,38 @@
+xfce4-session (4.8.1-4~exp1) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/README.Debian updated
+    - mention LightDM.
+    - fix path for xfsm-shutdown-helper.                        closes: #637197
+
+  [ Lionel Le Folgoc ]
+  * debian/patches/05_force-xfsettingsd-start.patch: updated for xfce4-settings
+    4.9.0 ('--force' has been changed to '--replace').
+  * debian/control: bump xfce4-settings' dep to >= 4.9.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Aug 2011 13:59:29 +0200
+
+xfce4-session (4.8.1-3) unstable; urgency=low
+
+  * debian/patches:
+    - 03_dont-die-on-dbus-disconnect added, fix crash when dbus is restarted.
+                                                                closes: #627888
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 May 2011 00:37:18 +0200
+
+xfce4-session (4.8.1-2) unstable; urgency=low
+
+  * Upload to unstable. 
+  * debian/control:
+    - drop Emanuele and Simon from Uploaders, thanks to them.
+    - update standards version to 3.9.2.
+  * debian/patches:
+    - 05_force-xfsettingsd-start added, force xfsettingsd to start.
+  * debian/postinst:
+    - lower x-session-manager priority so startxfce4 takes precedence.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Apr 2011 16:39:47 +0200
+
 xfce4-session (4.8.1-1) experimental; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2011-08-18 11:30:30 UTC (rev 5937)
+++ desktop/branches/experimental/xfce4-session/debian/control	2011-08-18 11:48:05 UTC (rev 5938)
@@ -2,14 +2,13 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), 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), hardening-includes
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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 +16,7 @@
 Package: xfce4-session
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.9.0), xfconf
 Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
  dbus-x11, x11-xserver-utils
 Suggests: sudo, fortunes-mod

Added: desktop/branches/experimental/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch	2011-08-18 11:48:05 UTC (rev 5938)
@@ -0,0 +1,13 @@
+diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
+index 0c9ba05..9b7c495 100644
+--- a/xfce4-session/xfsm-manager.c
++++ b/xfce4-session/xfsm-manager.c
+@@ -1837,6 +1837,8 @@ xfsm_manager_dbus_init (XfsmManager *manager)
+   dbus_connection_add_filter (dbus_g_connection_get_connection (manager->session_bus),
+                               xfsm_manager_watch_dbus_disconnect,
+                               manager, NULL);
++
++  dbus_connection_set_exit_on_disconnect (manager->session_bus, FALSE);
+ }
+ 
+ 

Added: desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch	2011-08-18 11:48:05 UTC (rev 5938)
@@ -0,0 +1,13 @@
+diff --git a/xfce4-session/main.c b/xfce4-session/main.c
+index ff6e324..82632eb 100644
+--- a/xfce4-session/main.c
++++ b/xfce4-session/main.c
+@@ -144,7 +144,7 @@ init_display (XfsmManager   *manager,
+   sm_init (channel, disable_tcp, manager);
+ 
+   /* start xfsettingsd */
+-  if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
++  if ( !g_spawn_command_line_async ("xfsettingsd --replace", NULL))
+   {
+     g_warning ("Could not start xfsettingsd");
+   }

Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series	2011-08-18 11:30:30 UTC (rev 5937)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series	2011-08-18 11:48:05 UTC (rev 5938)
@@ -1,2 +1,4 @@
 01_correct_shadows.patch
 02_fix-fortune-path.patch
+03_dont-die-on-dbus-disconnect.patch
+05_force-xfsettingsd-start.patch

Modified: desktop/branches/experimental/xfce4-session/debian/postinst
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/postinst	2011-08-18 11:30:30 UTC (rev 5937)
+++ desktop/branches/experimental/xfce4-session/debian/postinst	2011-08-18 11:48:05 UTC (rev 5938)
@@ -2,7 +2,7 @@
 
 if [ "$1" = configure ]; then
   update-alternatives --install /usr/bin/x-session-manager \
-    x-session-manager /usr/bin/xfce4-session 50 \
+    x-session-manager /usr/bin/xfce4-session 40 \
     --slave /usr/share/man/man1/x-session-manager.1.gz \
     x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz 
 fi

More information about the Pkg-xfce-commits mailing list