[Pkg-xfce-commits] r7115 - in desktop/branches/experimental/xfwm4/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-07-22 15:44:08 +0000 (Sun, 22 Jul 2012)
New Revision: 7115

Added:
   desktop/branches/experimental/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
   desktop/branches/experimental/xfwm4/debian/patches/series
Modified:
   desktop/branches/experimental/xfwm4/debian/changelog
   desktop/branches/experimental/xfwm4/debian/rules
Log:
* debian/patches:
  - 0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del added, fix
    deletion of current workspace sometime deleting the last one.

Modified: desktop/branches/experimental/xfwm4/debian/changelog
===================================================================
--- desktop/branches/experimental/xfwm4/debian/changelog	2012-07-21 18:55:39 UTC (rev 7114)
+++ desktop/branches/experimental/xfwm4/debian/changelog	2012-07-22 15:44:08 UTC (rev 7115)
@@ -1,3 +1,11 @@
+xfwm4 (4.10.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del added, fix
+      deletion of current workspace sometime deleting the last one.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 Jul 2012 14:55:49 +0200
+
 xfwm4 (4.10.0-1) experimental; urgency=low
 
   * New upstream stable release.

Added: desktop/branches/experimental/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
===================================================================
--- desktop/branches/experimental/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch	                        (rev 0)
+++ desktop/branches/experimental/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch	2012-07-22 15:44:08 UTC (rev 7115)
@@ -0,0 +1,42 @@
+From c4d89dd11e2c33f6f5797fb82910b97d483fb599 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Wed, 18 Jul 2012 22:30:36 +0200
+Subject: [PATCH] Revert part of git commit 8637c3a as this breaks deletetion
+ of current workspace (bug 8827)
+
+---
+ src/workspaces.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/workspaces.c b/src/workspaces.c
+index fb19ab0..f57eec9 100644
+--- a/src/workspaces.c
++++ b/src/workspaces.c
+@@ -492,7 +492,8 @@ workspaceInsert (ScreenInfo * screen_info, guint position)
+ void
+ workspaceDelete (ScreenInfo * screen_info, guint position)
+ {
+-    guint count;
++    Client *c;
++    guint i, count;
+ 
+     g_return_if_fail (screen_info != NULL);
+ 
+@@ -504,6 +505,14 @@ workspaceDelete (ScreenInfo * screen_info, guint position)
+         return;
+     }
+ 
++    for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
++    {
++        if (c->win_workspace > position)
++        {
++            clientSetWorkspace (c, c->win_workspace - 1, TRUE);
++        }
++    }
++
+     workspaceSetCount(screen_info, count - 1);
+ }
+ 
+-- 
+1.7.10.4
+

Added: desktop/branches/experimental/xfwm4/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfwm4/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/xfwm4/debian/patches/series	2012-07-22 15:44:08 UTC (rev 7115)
@@ -0,0 +1 @@
+0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch

Modified: desktop/branches/experimental/xfwm4/debian/rules
===================================================================
--- desktop/branches/experimental/xfwm4/debian/rules	2012-07-21 18:55:39 UTC (rev 7114)
+++ desktop/branches/experimental/xfwm4/debian/rules	2012-07-22 15:44:08 UTC (rev 7115)
@@ -7,4 +7,4 @@
 	dh_strip --dbg-package=xfwm4-dbg
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf