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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 12:14:46 +0000 (Sun, 07 Nov 2010)
New Revision: 4536

Removed:
   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:
drop patch included in the new upstream


Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2010-11-07 12:13:19 UTC (rev 4535)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2010-11-07 12:14:46 UTC (rev 4536)
@@ -20,10 +20,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>  Fri, 05 Nov 2010 09:24:37 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 13:14:04 +0100
 
 xfce4-utils (4.6.2-1) unstable; urgency=low
 

Deleted: 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	2010-11-07 12:13:19 UTC (rev 4535)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/05_do-not-launch-a-consolekit-session.patch	2010-11-07 12:14:46 UTC (rev 4536)
@@ -1,25 +0,0 @@
-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-11-07 12:13:19 UTC (rev 4535)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/series	2010-11-07 12:14:46 UTC (rev 4536)
@@ -1,4 +1,3 @@
 01_xflock4-test-running-screensaver.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch
-05_do-not-launch-a-consolekit-session.patch