[Pkg-xfce-commits] r1018 - in desktop/trunk/xfce4-session/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-12-18 14:19:43 +0100 (Mon, 18 Dec 2006)
New Revision: 1018

Added:
   desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
   desktop/trunk/xfce4-session/debian/patches/series
   desktop/trunk/xfce4-session/debian/rules
Log:
use a default splashscreen even if none was configured in settings file
(for example if desktop-base isn't installed). Remove splash screen defs from
xfce4-session.rc


Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2006-12-16 12:52:52 UTC (rev 1017)
+++ desktop/trunk/xfce4-session/debian/changelog	2006-12-18 13:19:43 UTC (rev 1018)
@@ -1,8 +1,9 @@
 xfce4-session (4.3.99.2-3) UNRELEASED; urgency=low
 
-  * Depends on desktop-base to have a xfce4-session.rc. 	closes: #402708
+  * Ship a xfce4-session.rc for failsafe session but use a default splash
+    engine if none is configured.				closes: #402708
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 16 Dec 2006 13:50:35 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 18 Dec 2006 12:00:40 +0100
 
 xfce4-session (4.3.99.2-2) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2006-12-16 12:52:52 UTC (rev 1017)
+++ desktop/trunk/xfce4-session/debian/control	2006-12-18 13:19:43 UTC (rev 1018)
@@ -8,11 +8,11 @@
 
 Package: xfce4-session
 Architecture: any
-Depends: ${shlibs:Depends}, fortune-mod, desktop-base (>= 0.3.20)
+Depends: ${shlibs:Depends}, fortune-mod
 Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel
 Suggests: sudo
 Provides: x-session-manager
-Conflicts: xfce4-toys
+Conflicts: xfce4-toys, desktop-base (<< 0.3.20)
 Replaces: xfce4-toys
 Description: Xfce4 Session Manager
  xfce4-session is an X11-compliant "session manager" designed for use with

Added: desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch	2006-12-16 12:52:52 UTC (rev 1017)
+++ desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch	2006-12-18 13:19:43 UTC (rev 1018)
@@ -0,0 +1,30 @@
+--- xfce4-session/xfce4-session/main.c.orig	2006-11-04 19:42:52.000000000 +0100
++++ xfce4-session/xfce4-session/main.c	2006-12-18 10:52:41.000000000 +0100
+@@ -61,6 +61,7 @@
+ #include <xfce4-session/xfsm-manager.h>
+ #include <xfce4-session/xfsm-startup.h>
+ 
++#define DEFAULT_SPLASH_ENGINE "mice"
+ 
+ void
+ setup_environment (void)
+@@ -134,7 +135,7 @@
+   gint n;
+ 
+   xfce_rc_set_group (rc, "Splash Screen");
+-  engine = xfce_rc_read_entry (rc, "Engine", NULL);
++  engine = xfce_rc_read_entry (rc, "Engine", DEFAULT_SPLASH_ENGINE);
+ 
+   splash_screen = xfsm_splash_screen_new (dpy, engine);  
+   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
+--- xfce4-session/xfce4-session.rc.orig	2006-11-04 19:42:56.000000000 +0100
++++ xfce4-session/xfce4-session.rc	2006-12-18 11:58:25.000000000 +0100
+@@ -44,8 +44,3 @@
+ Client2_PerScreen=False
+ Client3_Command=xfdesktop
+ Client3_PerScreen=False
+-
+-
+-# Default splash screen selection.
+-[Splash Screen]
+-Engine=mice

Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	2006-12-16 12:52:52 UTC (rev 1017)
+++ desktop/trunk/xfce4-session/debian/patches/series	2006-12-18 13:19:43 UTC (rev 1018)
@@ -1 +1,2 @@
 01_correct_shadows.patch
+02_use-mice-as-default-engine.patch

Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2006-12-16 12:52:52 UTC (rev 1017)
+++ desktop/trunk/xfce4-session/debian/rules	2006-12-18 13:19:43 UTC (rev 1018)
@@ -84,7 +84,7 @@
 
 	#Don't ship systemwide defaults as they will override desktop-base
 	#settings. We'll need something cleaner for post-etch.
-	rm -f $(CURDIR)/debian/xfce4-session/etc/xdg/xfce4-session/xfce4-session.rc
+	#rm -f $(CURDIR)/debian/xfce4-session/etc/xdg/xfce4-session/xfce4-session.rc
 
 	chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
 		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \