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

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-10-13 22:51:25 +0000 (Mon, 13 Oct 2008)
New Revision: 2383

Added:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch
Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
Log:
  - 02_use-mice-as-default-engine dropped.
  - 03_default-splash-engine.patch added, we use the simple engine by
    default.
  - other patches reordered. 

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-13 22:24:27 UTC (rev 2382)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-13 22:51:25 UTC (rev 2383)
@@ -19,10 +19,13 @@
     - update build-deps for tuco-tuco.
     - add build dep on libxfconf-0-dev, libglade2-dev.
   * debian/patches:
-    - 02_use-mice-as-default-engine dropped, Mice is the default splash engine.
+    - 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. 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 13 Oct 2008 10:54:40 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 14 Oct 2008 00:33:09 +0200
 
 xfce4-session (4.4.2-6) unstable; urgency=low
 

Copied: desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch (from rev 2376, desktop/branches/svn-snapshots/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch)
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch	2008-10-13 22:51:25 UTC (rev 2383)
@@ -0,0 +1,16 @@
+--- a/xfce4-session-logout/xfce4-session-logout.1.orig	2006-05-30 15:02:15.000000000 -0400
++++ b/xfce4-session-logout/xfce4-session-logout.1	2006-08-04 00:09:45.000000000 -0400
+@@ -5,11 +5,7 @@
+ .B xfce4-session-logout
+ .br
+ .SH DESCRIPTION
+-This manual page documents briefly the
+-.B xfce4-session-logout
+-command.
+-.PP
+-The \fBxfce4-session-logout\fP command allows you to programmatically
++The \fBxfce4-session-logout\fP command allows you to
+ logout from your Xfce session. It requests the session manager to display
+ the logout confirmation screen.
+ 
+


Property changes on: desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: 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	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_default-splash-engine.patch	2008-10-13 22:51:25 UTC (rev 2383)
@@ -0,0 +1,13 @@
+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"));

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch	2008-10-13 22:24:27 UTC (rev 2382)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch	2008-10-13 22:51:25 UTC (rev 2383)
@@ -1,16 +0,0 @@
---- a/xfce4-session-logout/xfce4-session-logout.1.orig	2006-05-30 15:02:15.000000000 -0400
-+++ b/xfce4-session-logout/xfce4-session-logout.1	2006-08-04 00:09:45.000000000 -0400
-@@ -5,11 +5,7 @@
- .B xfce4-session-logout
- .br
- .SH DESCRIPTION
--This manual page documents briefly the
--.B xfce4-session-logout
--command.
--.PP
--The \fBxfce4-session-logout\fP command allows you to programmatically
-+The \fBxfce4-session-logout\fP command allows you to
- logout from your Xfce session. It requests the session manager to display
- the logout confirmation screen.
- 
-

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-13 22:24:27 UTC (rev 2382)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-13 22:51:25 UTC (rev 2383)
@@ -1,2 +1,3 @@
 01_correct_shadows.patch
-04_xfce4-session-logout-manpage-typo.patch
+02_xfce4-session-logout-manpage-typo.patch
+03_default-splash-engine.patch