[Pkg-xfce-commits] r2435 - in desktop/branches/svn-snapshots/xfce4-session/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-10-17 06:21:16 +0000 (Fri, 17 Oct 2008)
New Revision: 2435

Added:
   desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml
Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
   desktop/branches/svn-snapshots/xfce4-session/debian/rules
Log:
* debian/xfce4-session.xml:
  - ship a xfconf config file for selecting the simple engine, put it in
    desktop-base dirs until we can ship it in desktop-base package.

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-17 06:05:06 UTC (rev 2434)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-17 06:21:16 UTC (rev 2435)
@@ -20,12 +20,13 @@
     - add build dep on libxfconf-0-dev, libglade2-dev.
   * debian/patches:
     - 02_use-mice-as-default-engine dropped.
-    - 03_default-splash-engine.patch added, we use the simple engine by
-      default.
     - 07_parallel-startup removed, included upstream.
     - other patches reordered. 
+  * debian/xfce4-session.xml:
+    - ship a xfconf config file for selecting the simple engine, put it in
+      desktop-base dirs until we can ship it in desktop-base package.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 14 Oct 2008 00:33:09 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 17 Oct 2008 08:20:20 +0200
 
 xfce4-session (4.4.2-6) unstable; urgency=low
 

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch	2008-10-17 06:05:06 UTC (rev 2434)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch	2008-10-17 06:21:16 UTC (rev 2435)
@@ -1,13 +0,0 @@
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index a2f5cbf..203d2ae 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -139,7 +139,7 @@ init_display (XfsmManager   *manager,
- {
-   const gchar *engine;
- 
--  engine = xfconf_channel_get_string (channel, "/splash/Engine", "mice");
-+  engine = xfconf_channel_get_string (channel, "/splash/Engine", "simple");
- 
-   splash_screen = xfsm_splash_screen_new (dpy, engine);  
-   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-17 06:05:06 UTC (rev 2434)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-17 06:21:16 UTC (rev 2435)
@@ -1,3 +1,2 @@
 01_correct_shadows.patch
 02_xfce4-session-logout-manpage-typo.patch
-03_default-splash-engine.patch

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/rules	2008-10-17 06:05:06 UTC (rev 2434)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/rules	2008-10-17 06:21:16 UTC (rev 2435)
@@ -81,6 +81,10 @@
 	strfile `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips \
 		`pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips.dat
 
+	# Ship an xfconf config file selecting the simple engine for desktop-base
+	install -D -p -o root -g root -m 644 debian/xfce4-session.xml $(CURDIR)/debian/xfce4-session/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+  
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Added: desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml	2008-10-17 06:21:16 UTC (rev 2435)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+	<property name="splash" type="empty">
+		<property name="Engine" type="string" value="simple"/>
+	</property>
+</channel>