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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-09-08 18:10:42 +0000 (Wed, 08 Sep 2010)
New Revision: 4285

Added:
   desktop/branches/experimental/xfce4-utils/debian/patches/05_do-not-launch-a-consolekit-session.patch
Modified:
   desktop/branches/experimental/xfce4-utils/debian/changelog
   desktop/branches/experimental/xfce4-utils/debian/patches/series
Log:
debian/patches/05_do-not-launch-a-consolekit-session.patch: drop
ck-launch-session as CK is handled in xfce4-session (Xfce #6684)

Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-05 17:04:03 UTC (rev 4284)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-08 18:10:42 UTC (rev 4285)
@@ -16,6 +16,8 @@
   * debian/rules: force $docdir to /usr/share/doc/xfce4-utils, and drop
     $libexecdir, unneeded.
   * debian/control: add myself to Uploaders.
+  * debian/patches/05_do-not-launch-a-consolekit-session.patch: drop
+    ck-launch-session as CK is handled in xfce4-session (Xfce #6684)
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:11:55 +0200
 

Added: desktop/branches/experimental/xfce4-utils/debian/patches/05_do-not-launch-a-consolekit-session.patch
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/05_do-not-launch-a-consolekit-session.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/05_do-not-launch-a-consolekit-session.patch	2010-09-08 18:10:42 UTC (rev 4285)
@@ -0,0 +1,25 @@
+From ea8c4b0db31855cb144cd5b863a045423d4afbfc Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Wed, 08 Sep 2010 10:04:05 +0000
+Subject: Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).
+
+---
+diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
+index 2aaf1df..2bd43ec 100755
+--- a/scripts/xinitrc.in.in
++++ b/scripts/xinitrc.in.in
+@@ -196,11 +196,7 @@ fi
+ 
+ # Run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+-    if which ck-launch-session >/dev/null 2>&1; then
+-      ck-launch-session xfce4-session
+-    else
+-      xfce4-session
+-    fi
++    xfce4-session
+ 
+     if test "$ssh_agent_kill_cmd"; then
+         echo "running '$ssh_agent_kill_cmd'"
+--
+cgit v0.8.2.1

Modified: desktop/branches/experimental/xfce4-utils/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/series	2010-09-05 17:04:03 UTC (rev 4284)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/series	2010-09-08 18:10:42 UTC (rev 4285)
@@ -1,3 +1,4 @@
 01_xflock4-test-running-screensaver.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch
+05_do-not-launch-a-consolekit-session.patch