Author: daniel Date: 2003-07-03 06:51:41 -0500 (Thu, 03 Jul 2003) New Revision: 283
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff branches/4.3.0/sid/debian/rules Log: "yes, but does it *build*?" rules: force LC_COLLATE=C on user, bah. #000_stolen_from_HEAD: clean up trident_driver mess - whoever did this didn't do it very cleanly. :( Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 11:41:59 UTC (rev 282) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-07-03 11:51:41 UTC (rev 283) @@ -298,16 +298,7 @@ diff -u -p -r1.35 -r1.36 --- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/01 23:02:09 1.35 +++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/19 11:01:54 1.36 -@@ -21,7 +21,7 @@ - * - * Author: Alan Hourihane, [EMAIL PROTECTED] - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.34 2003/06/01 22:21:01 alanh Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.35 2003/06/01 23:02:09 alanh Exp $ */ - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -773,7 +773,7 @@ +@@ -852,7 +852,7 @@ } else { OUTW(0x3C4, 0x0097); /* 1x line buffers */ } Modified: branches/4.3.0/sid/debian/rules ============================================================================== --- branches/4.3.0/sid/debian/rules 2003-07-03 11:41:59 UTC (rev 282) +++ branches/4.3.0/sid/debian/rules 2003-07-03 11:51:41 UTC (rev 283) @@ -26,6 +26,8 @@ # oh my God, this is a gross hack ELSE:=else +# oh my God, this is even worse +LC_COLLATE=C M4:=m4 # This is a horrendous kludge to ensure that some scripts we need are executable. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]