Author: branden Date: 2004-02-26 15:39:00 -0500 (Thu, 26 Feb 2004) New Revision: 1112
Modified: trunk/debian/changelog trunk/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff trunk/debian/patches/055_lnx_evdev_keyboard.diff Log: Remove extraneous #undef from lnx_io.c and lnx_kbd.c. Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-02-26 20:36:30 UTC (rev 1111) +++ trunk/debian/changelog 2004-02-26 20:39:00 UTC (rev 1112) @@ -140,8 +140,12 @@ debian-l10n-french!). Re-run debconf-updatepo. (Closes: #234903) - debian/po/fr.po - -- Branden Robinson <[EMAIL PROTECTED]> Thu, 26 Feb 2004 15:31:48 -0500 + * Remove extraneous #undef from lnx_io.c and lnx_kbd.c. + - debian/patches/050_fix_lnx_io_kbd_rate_fix.diff + - debian/patches/055_lnx_evdev_keyboard.diff: resync + -- Branden Robinson <[EMAIL PROTECTED]> Thu, 26 Feb 2004 15:37:22 -0500 + xfree86 (4.3.0-2) unstable; urgency=low * The "It's like I have a shotgun in my mouth, I've got my finger on the Modified: trunk/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff =================================================================== --- trunk/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff 2004-02-26 20:36:30 UTC (rev 1111) +++ trunk/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff 2004-02-26 20:39:00 UTC (rev 1112) @@ -8,8 +8,8 @@ Not submitted upstream yet. ---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2004-01-16 13:17:05.000000000 -0500 -+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-16 13:17:15.000000000 -0500 +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2004-02-26 13:31:07.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-02-26 13:31:39.000000000 -0500 @@ -73,7 +73,9 @@ #include <asm/kbio.h> #endif @@ -35,8 +35,17 @@ static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE ---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-01-16 13:17:10.000000000 -0500 -+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-01-16 13:18:21.000000000 -0500 +@@ -141,8 +150,6 @@ + #endif /* KIOCSRATE */ + } + +-#undef rate +- + #if NeedFunctionPrototypes + void xf86SetKbdRepeat(char rad) + #else +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2004-02-26 13:31:13.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-02-26 13:31:44.000000000 -0500 @@ -100,7 +100,9 @@ #include <asm/kbio.h> #endif @@ -62,3 +71,12 @@ static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE +@@ -168,8 +177,6 @@ + #endif /* KIOCSRATE */ + } + +-#undef rate +- + static void + SetKbdRepeat(InputInfoPtr pInfo, char rad) + { Modified: trunk/debian/patches/055_lnx_evdev_keyboard.diff =================================================================== --- trunk/debian/patches/055_lnx_evdev_keyboard.diff 2004-02-26 20:36:30 UTC (rev 1111) +++ trunk/debian/patches/055_lnx_evdev_keyboard.diff 2004-02-26 20:39:00 UTC (rev 1112) @@ -1,8 +1,7 @@ $Id$ -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 +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-02-26 13:31:44.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-02-26 13:33:12.000000000 -0500 @@ -22,6 +22,7 @@ #include "xf86OSKbd.h" #include "atKeynames.h" @@ -11,7 +10,7 @@ #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */ -@@ -500,8 +501,8 @@ +@@ -498,8 +499,8 @@ return TRUE; } @@ -22,7 +21,7 @@ { KbdDevPtr pKbd = pInfo->private; -@@ -540,3 +541,381 @@ +@@ -538,3 +539,381 @@ #endif return TRUE; }