X Strike Force XFree86 SVN commit: rev 871 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2003-12-24 18:13:49 -0500 (Wed, 24 Dec 2003)
New Revision: 871
Modified:
branches/4.3.0/sid/debian/patches/055_lnx_evdev_keyboard.diff
Log:
Resync diff offsets with respect to change r758 (should have been part of
that commit), which changed lnx_kbd.c in 000_stolen_from_HEAD.diff.
Modified: branches/4.3.0/sid/debian/patches/055_lnx_evdev_keyboard.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/055_lnx_evdev_keyboard.diff 2003-12-24 23:05:29 UTC (rev 870)
+++ branches/4.3.0/sid/debian/patches/055_lnx_evdev_keyboard.diff 2003-12-24 23:13:49 UTC (rev 871)
@@ -1,8 +1,8 @@
$Id$
-diff -ur build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
---- build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-03-26 19:53:47.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-03-15 08:46:16.000000000 -0500
+diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2003-12-24 13:15:17.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-12-24 13:15:21.000000000 -0500
@@ -22,6 +22,7 @@
#include "xf86OSKbd.h"
#include "atKeynames.h"
@@ -11,7 +11,7 @@
#define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */
-@@ -481,8 +482,8 @@
+@@ -491,8 +492,8 @@
return TRUE;
}
@@ -22,7 +22,7 @@
{
KbdDevPtr pKbd = pInfo->private;
-@@ -521,3 +522,381 @@
+@@ -531,3 +532,381 @@
#endif
return TRUE;
}
Reply to: