From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 15 May 2007 01:14:48 +0000 (+0000)
Subject: Removed temporary fix included in new upstream version.
X-Git-Tag: 20070506-1~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a5ea360cd6461b4e494e0350bd6c9f5aa9787aca;p=ion3.git

Removed temporary fix included in new upstream version.
---

diff --git a/debian/patches/00list b/debian/patches/00list
index b72c46e..24d4144 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
-102_config-request-fix.diff
 201_fix-paths.diff
 202_fix-menus.diff
 204_fix-bindings.diff
diff --git a/debian/patches/102_config-request-fix.diff b/debian/patches/102_config-request-fix.diff
deleted file mode 100644
index 69175f2..0000000
--- a/debian/patches/102_config-request-fix.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-@DPATCH@                                                                                                                                                       
-Mon Mar 19 18:37:26 GMT 2007  Tuomo Valkonen <tuomov@iki.fi>
-  * Oops, return in wrong place in fs rq check was breaking other cfgrqs
-diff -rN -u old-ion3-darcs/ioncore/clientwin.c new-ion3-darcs/ioncore/clientwin.c
---- old-ion3-darcs/ioncore/clientwin.c	2007-03-25 23:14:35.000000000 +0100
-+++ new-ion3-darcs/ioncore/clientwin.c	2007-03-25 23:14:35.000000000 +0100
-@@ -1085,9 +1085,9 @@
-             
-             if(!region_fullscreen_scr(grp, scr, sw))
-                 cwin->flags&=~CLIENTWIN_FS_RQ;
-+                
-+            return TRUE;
-         }
--        
--        return TRUE;
-     }
- 
-     return FALSE;
-