Author: branden Date: 2003-08-01 16:34:01 -0500 (Fri, 01 Aug 2003) New Revision: 355
Added: branches/4.3.0/sid/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff Modified: branches/4.3.0/sid/debian/changelog Log: debian/patches/911_debian_XF86Config_to_XF86Config-4.diff: merge this (forgotten?) patch from the trunk and resync with 4.3.0 and current patches Modified: branches/4.3.0/sid/debian/changelog ============================================================================== --- branches/4.3.0/sid/debian/changelog 2003-08-01 19:24:41 UTC (rev 354) +++ branches/4.3.0/sid/debian/changelog 2003-08-01 21:34:01 UTC (rev 355) @@ -1,3 +1,11 @@ +xfree86 (4.3.0-0pre1v2) experimental; urgency=low + + * debian/patches/911_debian_XF86Config_to_XF86Config-4.diff: merge this + (forgotten?) patch from the trunk and resync with 4.3.0 and current + patches + + -- Branden Robinson <[EMAIL PROTECTED]> Fri, 1 Aug 2003 16:32:58 -0500 + xfree86 (4.3.0-0pre1v1) experimental; urgency=low * new upstream release Copied: branches/4.3.0/sid/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff (from rev 354, trunk/debian/patches/909_debian_XF86Config_to_XF86Config-4.diff) ============================================================================== --- trunk/debian/patches/909_debian_XF86Config_to_XF86Config-4.diff 2003-08-01 19:24:41 UTC (rev 354) +++ branches/4.3.0/sid/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2003-08-01 21:34:01 UTC (rev 355) @@ -0,0 +1,226 @@ +This patch by Branden Robinson. + +--- xc/programs/Xserver/hw/xfree86/XF86Config.man~ 2003-08-01 15:38:20.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/XF86Config.man 2003-08-01 15:39:38.000000000 -0500 +@@ -1,13 +1,13 @@ + .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.man,v 1.14 2003/02/26 18:59:49 dawes Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' +-.TH XF86Config __filemansuffix__ __vendorversion__ ++.TH XF86Config-4 __filemansuffix__ __vendorversion__ + .SH NAME +-XF86Config - Configuration File for XFree86 ++XF86Config-4 - Configuration File for XFree86 + .SH DESCRIPTION + .I XFree86 +-uses a configuration file called +-.B XF86Config ++(version 4.x) uses a configuration file called ++.B XF86Config-4 + for its initial setup. This configuration file is searched for in the + following places when the server is started as a normal user: + .PP +--- xc/programs/Xserver/hw/xfree86/XFree86.man~ 2003-08-01 15:38:34.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/XFree86.man 2003-08-01 15:44:02.000000000 -0500 +@@ -93,21 +93,24 @@ + Allow the server to start up even if the mouse device can't be opened + or initialised. This is equivalent to the + .B AllowMouseOpenFail +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-allowNonLocalModInDev + Allow changes to keyboard and mouse settings from non-local clients. + By default, connections from non-local clients are not allowed to do + this. This is equivalent to the + .B AllowNonLocalModInDev +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-allowNonLocalXvidtune + Make the VidMode extension available to remote clients. This allows + the xvidtune client to connect from another host. This is equivalent + to the + .B AllowNonLocalXvidtune +-XF86Config(__filemansuffix__) file option. By default non-local ++.IR XF86Config-4 (__filemansuffix__) ++file option. By default non-local + connections are not allowed. + .TP 8 + .B \-bgamma \fIvalue\fP +@@ -127,7 +130,8 @@ + .B \-configure + When this option is specified, the X server loads all video driver + modules, probes for available hardware, and writes out an initial +-XF86Config(__filemansuffix__) file based on what was detected. This ++.IR XF86Config-4 (__filemansuffix__) ++file based on what was detected. This + option currently has some problems on some platforms, but in most cases + it is a good way to bootstrap the configuration process. This option + is only available when the server is run as root (i.e, with real-uid +@@ -145,14 +149,16 @@ + Disable dynamic modification of input device settings. This is equivalent + to the + .B DisableModInDev +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-disableVidMode + Disable the the parts of the VidMode extension (used by the xvidtune + client) that can be used to change the video modes. This is equivalent + to the + .B DisableVidModeExtension +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-fbbpp \fIn\fP + Sets the number of framebuffer bits per pixel. You should only set this +@@ -198,7 +204,9 @@ + support (or can use) this option. + .TP 8 + .B \-keyboard \fIkeyboard-name\fP +-Use the XF86Config(__filemansuffix__) file ++Use the ++.IR XF86Config-4 (__filemansuffix__) ++file + .B InputDevice + section called + .I keyboard-name +@@ -211,7 +219,9 @@ + section is used for the core keyboard. + .TP 8 + .B \-layout \fIlayout-name\fP +-Use the XF86Config(__filemansuffix__) file ++Use the ++.IR XF86Config-4 (__filemansuffix__) ++file + .B Layout + section called + .IR layout-name . +@@ -258,17 +268,21 @@ + pixmap format, even though it is a perfectly legal format. + This is equvalent to the + .B Pixmap +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-pixmap32 + Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel. + This is usually the default. + This is equvalent to the + .B Pixmap +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B \-pointer \fIpointer-name\fP +-Use the XF86Config(__filemansuffix__) file ++Use the ++.IR XF86Config-4 (__filemansuffix__) ++file + .B InputDevice + section called + .I pointer-name +@@ -304,7 +318,9 @@ + scanpci(1) and pcitweak(1). + .TP 8 + .B \-screen \fIscreen-name\fP +-Use the XF86Config(__filemansuffix__) file ++Use the ++.IR XF86Config-4 (__filemansuffix__) ++file + .B Screen + section called + .IR screen-name . +@@ -363,7 +379,9 @@ + is used to recognize the special key combinations, see + the documentation on the + .B HandleSpecialKeys +-option in the XF86Config(__filemansuffix__) man page. ++option in the ++.IR XF86Config-4 (__filemansuffix__) ++man page. + .PP + The special combinations of key presses recognized directly + by \fIXFree86\fP are: +@@ -372,24 +390,28 @@ + Immediately kills the server -- no questions asked. This can be disabled + with the + .B DontZap +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B Ctrl+Alt+Keypad-Plus + Change video mode to next one specified in the configuration file. + This can be disabled with the + .B DontZoom +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B Ctrl+Alt+Keypad-Minus + Change video mode to previous one specified in the configuration file. + This can be disabled with the + .B DontZoom +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .TP 8 + .B Ctrl+Alt+Keypad-Multiply + Not treated specially by default. If the + .B AllowClosedownGrabs +-XF86Config(__filemansuffix__) file option is specified, this key sequence ++.IR XF86Config-4 (__filemansuffix__) ++file option is specified, this key sequence + kills clients with an active keyboard or mouse grab as well as killing any + application that may have locked the server, normally using the + XGrabServer(__libmansuffix__) Xlib function. +@@ -397,7 +419,8 @@ + .B Ctrl+Alt+Keypad-Divide + Not treated specially by default. If the + .B AllowDeactivateGrabs +-XF86Config(__filemansuffix__) file option is specified, this key sequence ++.IR XF86Config-4 (__filemansuffix__) ++file option is specified, this key sequence + deactivates any active keyboard and mouse grabs. + .TP 8 + .B Ctrl+Alt+F1...F12 +@@ -405,18 +428,20 @@ + combinations are used to switch to virtual terminals 1 through 12, + respectively. This can be disabled with the + .B DontVTSwitch +-XF86Config(__filemansuffix__) file option. ++.IR XF86Config-4 (__filemansuffix__) ++file option. + .SH SETUP + .I XFree86 + uses a configuration file called \fBXF86Config\fP for its initial setup. + Refer to the +-.I XF86Config(__filemansuffix__) ++.IR XF86Config (__filemansuffix__) + manual page for information about the + format of this file. + .SH FILES + The X server config file can be found in a range of locations. These + are documented fully in the +-.I XF86Config(__filemansuffix__) ++.IR XF86Config-4 (__filemansuffix__) ++ + manual page. The most commonly used locations are shown here. + .TP 30 + /etc/X11/XF86Config +@@ -465,7 +490,7 @@ + Initial access control list for display \fIn\fP + .SH "SEE ALSO" + X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), +-XF86Config(__filemansuffix__), xf86config(1), xf86cfg(1), xvidtune(1), ++XF86Config-4(__filemansuffix__), xf86config(1), xf86cfg(1), xvidtune(1), + apm(__drivermansuffix__), + ati(__drivermansuffix__), + chips(__drivermansuffix__), -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
