Author: fabbione Date: 2004-09-27 14:51:33 -0500 (Mon, 27 Sep 2004) New Revision: 1871
Modified: trunk/debian/CHANGESETS trunk/debian/patches/000_stolen_from_freedesktop.org.diff trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff Log: Re-Add patch headers. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-09-27 15:47:30 UTC (rev 1870) +++ trunk/debian/CHANGESETS 2004-09-27 19:51:33 UTC (rev 1871) @@ -72,7 +72,7 @@ 1851 Backport nv driver from X.org (merged from people/fabbione/nv-driver-backport) - 1867 + 1867, 1871 Update Czech debconf template translations (thanks, Miroslav Kure). 1868 Modified: trunk/debian/patches/000_stolen_from_freedesktop.org.diff =================================================================== --- trunk/debian/patches/000_stolen_from_freedesktop.org.diff 2004-09-27 15:47:30 UTC (rev 1870) +++ trunk/debian/patches/000_stolen_from_freedesktop.org.diff 2004-09-27 19:51:33 UTC (rev 1871) @@ -1,3 +1,23 @@ +$Id$ + +xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c @ 1.3 + * programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c: + (chipsClockSelect), (chipsClockFind), (chipsModeInitHiQV), + (chipsModeInitWingine), (chipsModeInit655xx): + Fixed Segfault on video mode switching when pScrn->currentMode did + not contain a valid mode. +2004-05-24 Egbert Eich <[EMAIL PROTECTED]> + +xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c +xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h +xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c +xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c +xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c +xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h +xc/programs/Xserver/hw/xfree86/xaa/xaarop.h +xc/programs/Xserver/hw/xfree86/common/xf86str.h + * Import minimum bits required to compile nv driver from X.org + diff -Naurd xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h xc/programs/Xserver/hw/xfree86/common/xf86str.h --- xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15 10:05:46.000000000 +0000 +++ xc/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15 10:14:05.000000000 +0000 Modified: trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff =================================================================== --- trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-09-27 15:47:30 UTC (rev 1870) +++ trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-09-27 19:51:33 UTC (rev 1871) @@ -1,3 +1,19 @@ +$Id$ + +[Do not recode this file!] + +Debian preferentially uses the name XF86Config-4 for the XFree86 4.x X +server configuration file. This is for two reasons: + 1) The XF86Config file format changed from XFree86 3.x to 4.x, and it's + not a good practice to change the format of a configuration file while + leaving its name the same. + 2) Debian used to support XFree86 3.x and 4.x in parallel, including the + simultaneous installation of XFree86 3.x and 4.x X servers; + consequently, each version of the X server needed to be able to read its + own particular configuration file -- they could not be named the same. + +This patch by Branden Robinson. + diff -Naurd xc.orig/programs/Xserver/hw/xfree86/XF86Config.man xc/programs/Xserver/hw/xfree86/XF86Config.man --- xc.orig/programs/Xserver/hw/xfree86/XF86Config.man 2004-09-15 11:46:54.000000000 +0000 +++ xc/programs/Xserver/hw/xfree86/XF86Config.man 2004-09-15 11:45:00.000000000 +0000