[Pkg-xfce-commits] r433 - in desktop/trunk/xfwm4/debian: . patches

[Simon Huggins]

Author: huggie-guest
Date: 2006-01-05 09:36:56 +0000 (Thu, 05 Jan 2006)
New Revision: 433

Added:
   desktop/trunk/xfwm4/debian/patches/
   desktop/trunk/xfwm4/debian/patches/00list
   desktop/trunk/xfwm4/debian/patches/01-window-move-key-fix.dpatch
Modified:
   desktop/trunk/xfwm4/debian/changelog
   desktop/trunk/xfwm4/debian/control
   desktop/trunk/xfwm4/debian/rules
Log:
Finally fix the move window to a different workspace key bug


Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2006-01-04 16:47:35 UTC (rev 432)
+++ desktop/trunk/xfwm4/debian/changelog	2006-01-05 09:36:56 UTC (rev 433)
@@ -1,3 +1,9 @@
+xfwm4 (4.2.3.2-2) unstable; urgency=low
+
+  * Add patch to fix moving windows to other workspaces        closes: #341058
+
+ -- Simon Huggins <huggie at earth.li>  Thu, 05 Jan 2006 00:41:18 +0000
+
 xfwm4 (4.2.3.2-1) unstable; urgency=low
 
   * New Upstream Release

Modified: desktop/trunk/xfwm4/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control	2006-01-04 16:47:35 UTC (rev 432)
+++ desktop/trunk/xfwm4/debian/control	2006-01-05 09:36:56 UTC (rev 433)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.2.3-1)
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.2.3-1), dpatch
 Standards-Version: 3.6.2
 
 Package: xfwm4

Added: desktop/trunk/xfwm4/debian/patches/00list
===================================================================
--- desktop/trunk/xfwm4/debian/patches/00list	2006-01-04 16:47:35 UTC (rev 432)
+++ desktop/trunk/xfwm4/debian/patches/00list	2006-01-05 09:36:56 UTC (rev 433)
@@ -0,0 +1 @@
+01-window-move-key-fix.dpatch

Added: desktop/trunk/xfwm4/debian/patches/01-window-move-key-fix.dpatch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/01-window-move-key-fix.dpatch	2006-01-04 16:47:35 UTC (rev 432)
+++ desktop/trunk/xfwm4/debian/patches/01-window-move-key-fix.dpatch	2006-01-05 09:36:56 UTC (rev 433)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-window-move-key-fix.dpatch by Simon Huggins <huggie at earth.li>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Window move workspaces fix
+
+--- ../src/events.c.old	2006-01-05 00:33:57.000000000 +0000
++++ ../src/events.c	2006-01-05 00:34:22.000000000 +0000
+@@ -542,7 +542,7 @@
+             case KEY_MOVE_WORKSPACE_7:
+             case KEY_MOVE_WORKSPACE_8:
+             case KEY_MOVE_WORKSPACE_9:
+-                if (key - KEY_WORKSPACE_1 < screen_info->workspace_count)
++                if (key - KEY_MOVE_WORKSPACE_1 < screen_info->workspace_count)
+                 {
+                     clientRaise (c);
+                     workspaceSwitch (screen_info, key - KEY_MOVE_WORKSPACE_1, c);

Modified: desktop/trunk/xfwm4/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules	2006-01-04 16:47:35 UTC (rev 432)
+++ desktop/trunk/xfwm4/debian/rules	2006-01-05 09:36:56 UTC (rev 433)
@@ -9,7 +9,9 @@
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
+include /usr/share/dpatch/dpatch.make
+
+configure: patch configure-stamp
 configure-stamp:
 
 	dh_testdir
@@ -23,7 +25,8 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	
 	dh_testdir
 	dh_testroot