Package: x11-common Severity: minor Tags: patch Hi, the Debian X FAQ needs to be updated to refer to the X.Org packages instead of only XFree86. Please find attached a proposed patch (which probably needs proofreading and/or rewording). I tried to let the relevant bits about XFree86 there, but updated references to package names, configuration/log files locations, etc. Cheers, Julien Cristau -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/dash Kernel: Linux 2.6.10 Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
--- debian/local/FAQ.xhtml~ 2005-07-21 22:29:28.911563687 +0200 +++ debian/local/FAQ.xhtml 2005-07-21 22:29:22.101771186 +0200 @@ -6,7 +6,7 @@ <head> <meta name="author" content="Branden Robinson" /> <meta name="keywords" content="Debian GNU Linux X Window System X11 X11R6 -XFree86 FAQ" /> +X.Org FAQ" /> <meta http-equiv="content-language" content="en-us" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> @@ -127,21 +127,20 @@ server?</a></li> <li><a href="#startxnonroot">Why am I not able to run <code class="command">startx</code> as a non-root user?</a></li> -<li><a href="#confmanagment">How do the XFree86 packages manage their +<li><a href="#confmanagment">How do the X.Org packages manage their non-conffile configuration files like <code class="filespec">/etc/X11/X</code>, <code class="filespec">/etc/X11/Xwrapper.config</code>, and <code - class="filespec">/etc/X11/XF86Config-4</code>?</a></li> + class="filespec">/etc/X11/xorg.conf</code>?</a></li> <li><a href="#forceoverwriteconf">I've customized my <code class="filespec">/etc/X11/X</code>, <code class="filespec">/etc/X11/Xwrapper.config</code>, and/or <code - class="filespec">/etc/X11/XF86Config-4</code> files so the packages don't + class="filespec">/etc/X11/xorg.conf</code> files so the packages don't automatically update them anymore. I'd like them automatically managed again, though; how can I achieve that?</a></li> <li><a href="#addcustomsect">How do I add custom sections to a <code class="command">dexconf</code>-generated <code - class="filespec">XF86Config</code> or <code - class="filespec">XF86Config-4</code> file?</a></li> + class="filespec">xorg.conf</code> file?</a></li> <li><a href="#nodrinotfatal">The X server log says there was an error and it's disabling DRI. Is that why the X server won't start?</a></li> <li><a href="#nocorefatal">The X server log says there was an error opening my @@ -166,7 +165,7 @@ windows; what's happening?</a></li> <li><a href="#precompiledkeymap">How can I set up my X server or X terminal to use XKB without any X libraries or XKB data installed?</a></li> -<li><a href="#debugxserver">How can I help debug the XFree86 X server?</a></li> +<li><a href="#debugxserver">How can I help debug the Xorg X server?</a></li> <li><a href="#debugmesadri">How can I help debug 3D acceleration problems?</a></li> </ul> @@ -256,7 +255,7 @@ <p>As is standard in the Debian system, these FAQs are found in <code class="filespec">/usr/share/doc/<var>packagename</var>/</code>. The Debian X -FAQ is part of the <code class="package">xfree86-common</code> package, and the +FAQ is part of the <code class="package">x11-common</code> package, and the XTerm FAQ is part of the <code class="package">xterm</code> package.</p> <h2><a id="howto">How to Use this Document</a></h2> @@ -274,16 +273,16 @@ computer with a graphical Web browser (or, at least, a browser capable of sophisticated text rendering, using different colors and typefaces within an XHTML document), please consult the XHTML version instead. On Debian systems -with the <code class="package">xfree86-common</code> package installed, you can +with the <code class="package">x11-common</code> package installed, you can find this FAQ at <a -href="file:///usr/share/doc/xfree86-common/FAQ.xhtml">file:///usr/share/doc/xfree86-common/FAQ.xhtml</a>.</p> +href="file:///usr/share/doc/x11-common/FAQ.xhtml">file:///usr/share/doc/x11-common/FAQ.xhtml</a>.</p> <p>The <a -href="http://necrotic.deadbeast.net/svn/xfree86/trunk/debian/local/FAQ.xhtml">most +href="http://necrotic.deadbeast.net/svn/xorg-x11/trunk/debian/local/FAQ.xhtml">most up-to-date copy of this FAQ</a> is maintained in the <a href="http://subversion.tigris.org">Subversion</a> <a -href="http://necrotic.deadbeast.net/svn/xfree86/">repository</a> where the -Debian <code class="package">xfree86</code> source package is maintained.</p> +href="http://necrotic.deadbeast.net/svn/xorg-x11/">repository</a> where the +Debian <code class="package">xorg-x11</code> source package is maintained.</p> <p>The following table summarizes the semantic usage of visual markup in this document:</p> @@ -312,13 +311,13 @@ <tr> <td>file specification</td> <td>purple text</td> - <td><code class="filespec">/etc/X11/XF86Config-4</code>, <code - class="filespec">/var/log/XFree86.0.log</code></td> + <td><code class="filespec">/etc/X11/xorg.conf</code>, <code + class="filespec">/var/log/Xorg.0.log</code></td> </tr> <tr> <td>Debian package name</td> <td>blue-green text</td> - <td><code class="package">xserver-xfree86</code>, <code + <td><code class="package">xserver-xorg</code>, <code class="package">xterm</code></td> </tr> <tr> @@ -339,7 +338,7 @@ <p>I welcome suggestions for improving the utility and accessibility of this document; the best way to communicate this is by filing a <code class="other">wishlist</code>-severity bug report against the <code -class="package">xfree86-common</code> package. I recommend the <code +class="package">x11-common</code> package. I recommend the <code class="command">reportbug</code> command from the Debian package of the same name for all bug reports.</p> @@ -654,7 +653,7 @@ <p>The XFree86 package maintainers are committed to providing support and assistance to the <a href="http://www.debian.org/security/">Debian Security -Team</a> for the XFree86 4.3.0-based packages than Debian will ship in <code +Team</a> for the XFree86 4.3.0-based packages than Debian has shipped in <code class="other">sarge</code>. That is, our abandonment of the XFree86 Project, Inc., as an upstream source of code does not mean that we will abandon our commitment to the users of our production release.</p> @@ -686,10 +685,8 @@ maintain similar packaging standards, simplify the bug handling on shared components (like X libraries) and discuss future changes and improvements.</p> -<p>As of this writing (March 2005), packaging of the X.Org X11 distribution is -underway in the X Strike Force's <a -href="http://necrotic.deadbeast.net/svn/xorg-x11"><code -class="other">xorg-x11</code> Subversion repository</a>.</p> +<p>As of July 2005, packages of the X.Org X11 distribution are available in +Debian unstable (a.k.a <code class="other">sid</code>).</p> <h3><a id="defxservclient">What are X servers and X clients?</a></h3> @@ -762,7 +759,7 @@ In the Debian GNU/Linux system, creating and editing the <code class="filespec">.xsession</code> file in the user's home directory is the preferred method of customizing an X session. See <code -class="filespec">/usr/share/doc/xfree86-common/examples/xsession</code> for more +class="filespec">/usr/share/doc/x11-common/examples/xsession</code> for more information.</p> <h3><a id="defrootwindow">What is the root window?</a></h3> @@ -770,8 +767,8 @@ <p>Like the Unix filesystem, windows in X are laid out like a tree with a single "root". The root window is the window that is "behind" all others, and covers the entire screen from corner to corner (in fact, if the virtual -desktop feature of the XFree86 X servers is used, the root window can -actually be larger than the screen). People often place an image of some +desktop feature of the Xorg X servers is used, the root window can actually +be larger than the screen). People often place an image of some sort in the root window ("wallpaper"), or run a program which draws something interesting and/or pleasing in the root window.</p> @@ -1014,12 +1011,12 @@ --> </dl> -<p>When the XFree86 X server is started, it calls the <code +<p>When the Xorg X server is started, it calls the <code class="command">setxkbmap</code> utility to compile a keymap from the XKB configuration options (<code>XkbRules</code>, <code>XkbModel</code>, <code>XkbLayout</code>, <code>XkbVariant</code>, and <code>XkbOptions</code>) from its configuration file (usually <code -class="filespec">/etc/X11/XF86Config-4</code>). The XFree86 X server can be +class="filespec">/etc/X11/xorg.conf</code>). The Xorg X server can be told to disable XKB with the option <code>XkbDisable</code>. Furthermore, X servers in general can be told not to load an XKB keymap with the option <kbd>-noloadxkb</kbd>, or to load a pre-compiled keymap with the @@ -1129,7 +1126,7 @@ <p>On a Debian GNU/Linux system, the file <code class="filespec"><var>$HOME</var>/.xsession</code> is used (if present) to set up the user's X session. The file <code -class="filespec">/usr/share/doc/xfree86-common/examples/xsession</code> is an +class="filespec">/usr/share/doc/x11-common/examples/xsession</code> is an example file that may be used directly and contains a great deal of explicit instruction on customization.</p> @@ -1187,7 +1184,8 @@ server?</a></h3> <p>There are two answers to this question; one for version 3.x XFree86 X -servers, and one for version 4.x of the XFree86 X server.</p> +servers, and one for version 4.x of the XFree86 X server as well as the Xorg X +server.</p> <p>You can find out which version you are using by running "X -version" (you do not need to be root to execute this command).</p> @@ -1226,7 +1224,7 @@ <p><kbd>startx -- -bpp 16</kbd></p> -<h4>For version 4.x of the XFree86 X server:</h4> +<h4>For version 4.x of the XFree86 X server or the Xorg X server:</h4> <p>The best way to change the default color depth of the X server is to add a "DefaultDepth" line to the "Screen" section that corresponds to the X server you @@ -1262,7 +1260,8 @@ EndSubsection EndSection</pre> -<p>See <code class="manpage">XF86Config(5x)</code> for more information.</p> +<p>See <code class="manpage">XF86Config(5x)</code> or <code +class="manpage">xorg.conf(5x)</code> for more information.</p> <p>To change the color depth on a per-invocation basis with <code class="command">startx</code>, send the appropriate command line argument to the @@ -1270,9 +1269,9 @@ <p><kbd>startx -- -depth 16</kbd></p> -<p>See <code class="manpage">Xserver(1x)</code> , <code -class="manpage">XFree86(1x)</code> , and <code class="manpage">startx(1x)</code> -for more information.</p> +<p>See <code class="manpage">Xserver(1x)</code>, <code +class="manpage">XFree86(1x)</code> or <code class="manpage">Xorg(1x)</code>, +and <code class="manpage">startx(1x)</code> for more information.</p> <p>With <code class="command">xdm</code>, the <code class="filespec">/etc/X11/xdm/Xservers</code> file must be edited; there is not @@ -1301,7 +1300,7 @@ class="command">xdm</code> <code class="filespec">Xservers</code> file, because when <code class="command">xdm</code> starts at boot time, <code class="command">getty</code> may not have taken control of the virtual consoles -it manages. XFree86 X servers automatically place themselves on the first +it manages. Xorg X servers automatically place themselves on the first available virtual console unless told otherwise. One may then get the distressing problem of <code class="command">getty</code> attempting to respawn on a virtual console that <code class="command">xdm</code> has claimed for @@ -1394,8 +1393,8 @@ type=imps2 append='-B 321'</pre> -<p><strong>Example: <code -class="filespec">/etc/X11/XF86Config-4</code></strong></p> +<p><strong>Example: <code class="filespec">/etc/X11/XF86Config-4</code> +or <code class="filespec">/etc/X11/xorg.conf</code></strong></p> <pre>Section "InputDevice" Identifier "GPM repeater" @@ -1408,12 +1407,13 @@ <p>Note that in XFree86 4.3.0 (and therefore in X.Org X11R6.7.0 and later), the X server's mouse driver was rewritten in such a way that using any protocol -other than <code class="other">IntelliMouse</code> on the XFree86 side and <code -class="other">ms3</code> on the GPM side does not work well. If you are using -anything other than <code class="other">ms3</code> as the repeating protocol -(<code class="other">repeat_type</code>), you will likely want to change it to -<code class="other">ms3</code>. If your <code -class="filespec">XF86Config-4</code> file is automatically handled by <code +other than <code class="other">IntelliMouse</code> on the XFree86/X.Org side +and <code class="other">ms3</code> on the GPM side does not work well. If you +are using anything other than <code class="other">ms3</code> as the repeating +protocol (<code class="other">repeat_type</code>), you will likely want to +change it to <code class="other">ms3</code>. If your <code +class="filespec">XF86Config-4</code> or <code class="filespec">xorg.conf</code> +file is automatically handled by <code class="other">debconf</code> and uses <code class="filespec">/dev/gpmdata</code> as the port for the configured mouse, the protocol will automatically be migrated to <code class="other">IntelliMouse</code> if necessary.</p> @@ -1434,7 +1434,7 @@ class="package">xbase</code> installed, remove that before or simultaneously; <code class="package">xbase</code> depends on <code class="package">xdm</code>. See <code - class="filespec">/usr/share/doc/xfree86-common/README.Debian-upgrade</code> + class="filespec">/usr/share/doc/x11-common/README.Debian-upgrade</code> for more information.</p> </li> @@ -1475,11 +1475,12 @@ VC 7 for some purpose, simply edit <code class="filespec">/etc/X11/xdm/Xservers</code> and change the "vt7" argument on the ":0" server line to whatever VC is appropriate for your machine (vt8, vt12, -etc.). Note that while the XFree86 manual page says that if the "vt" argument -is not specified, the X server will use the first available virtual console, it -is not a good idea to omit this parameter when starting local X servers with -xdm. This is because even though <code class="command">xdm</code> starts at the -very end of the <code class="command">init</code> sequence, well after the <code +etc.). Note that while the <code class="manpage">Xorg(5x)</code> manual page +says that if the "vt" argument is not specified, the X server will use the +first available virtual console, it is not a good idea to omit this parameter +when starting local X servers with xdm. This is because even though <code +class="command">xdm</code> starts at the very end of the <code +class="command">init</code> sequence, well after the <code class="command">getty</code> processes that manage the virtual consoles, some machines get through the init sequence so quickly that getty has not yet claimed its VC's before <code class="command">xdm</code> starts. This leads to exactly @@ -1587,14 +1588,15 @@ <p><em>Thanks to Guillem Jover and Ingo Saitz for their assistance researching this entry.</em></p> -<p>In XFree86 4.3.0, the stock configuration data for the X Keyboard Extension -(XKB) was overhauled. One of the few downsides to this much-needed update was -that the "< >" key commonly found on European keyboards stopped -functioning for some people who had not paid close attention to their XKB -configuration in the past. Users of 102- or 105-key PC keyboards (as well as -miniature and laptop keyboards compatible with these models) should ensure that -their keyboard is configured accordingly in the <code -style="filespec">XF86Config-4</code> file, using the <code +<p>In XFree86 4.3.0 (and thus X.Org X11R6.7.0), the stock configuration data +for the X Keyboard Extension (XKB) was overhauled. One of the few downsides +to this much-needed update was that the "< >" key commonly found on +European keyboards stopped functioning for some people who had not paid close +attention to their XKB configuration in the past. Users of 102- or 105-key PC +keyboards (as well as miniature and laptop keyboards compatible with these +models) should ensure that their keyboard is configured accordingly in the +<code style="filespec">XF86Config-4</code> (or <code +style="filespec">xorg.conf</code>) file, using the <code style="other">pc102</code> or <code style="other">pc105</code> <code style="other">XkbModel</code> instead of <code style="other">pc101</code> or <code style="other">pc104</code>, respectively. U.S.-style PC keyboards do not @@ -1605,14 +1607,17 @@ <p>If your keyboard has a "< >" key, you probably have a 102- or 105-key model. The "< >" key may not work if you do not configure your keyboard -model correctly. You can use <kbd>dpkg-reconfigure xserver-xfree86</kbd> to +model correctly. You can use <kbd>dpkg-reconfigure xserver-xfree86</kbd> (or +<kbd>dpkg-reconfigure xserver-xorg</kbd>) to change this configuration parameter, or edit <code -class="filespec">/etc/X11/XF86Config-4</code> directly.</p> +class="filespec">/etc/X11/XF86Config-4</code> (or <code +class="filespec">/etc/X11/xorg.conf</code>) directly.</p> <p>If you have done this, or have already confirmed that your <code class="other">XkbModel</code> is set to <code class="other">pc102</code> or <code class="other">pc105</code> in the <code -class="filespec">XF86Config-4</code> file, but your "< >" key +class="filespec">XF86Config-4</code> (or <code +class="filespec">xorg.conf</code>) file, but your "< >" key <em>still</em> doesn't work in X, then an X client is probably reconfiguring your keyboard after the server starts.</p> @@ -1657,17 +1662,20 @@ XLookupString gives 0 bytes: ""</pre> <p>Then the X server is not starting with the correct keymap for your locale, -and you need to check your <code class="filespec">XF86Config-4</code> file -again. You may have a subtle problem, such as multiple keyboard input devices -defined in the file (and the wrong one is being used), or the <code -class="filespec">XF86Config-4</code> file may have been disregarded in favor of -a different configuration file. See the XF86Config-4(5x) manual page for more -information on these types of problems.</p> - -<p>Also note that the XFree86 X server log file (such as <code -class="filespec">/var/log/XFree86.0.log</code>) will not only tell you the name -of the configuration file that was used, but also what the X server thinks the -keyboard configuration is.</p> +and you need to check your <code class="filespec">XF86Config-4</code> (or +<code class="filespec">x.org</code>) file again. You may have a subtle problem, +such as multiple keyboard input devices defined in the file (and the wrong one +is being used), or the configuration file may have been disregarded in favor of +a different configuration file. See the <code +class="manpage">XF86Config-4(5x)</code> or <code +class="manpage">xorg.conf(5x)</code> manual page for more information on these +types of problems.</p> + +<p>Also note that the XFree86 — respectively Xorg — X server log +file (such as <code class="filespec">/var/log/XFree86.0.log</code> — +resp. <code class="filespec">/var/log/Xorg.0.log</code>) will not only tell +you the name of the configuration file that was used, but also what the X +server thinks the keyboard configuration is.</p> <p>If the X server can see your "< >" key when it starts this way, but not normally, then you <em>do</em> have a problem with an X client changing it after @@ -1956,8 +1964,9 @@ after switching back to a virtual console after starting X, and/or the gpm program spews messages about errors in the mouse protocol to your system logs when you switch, you may need to set up gpm as a repeater, and instruct the X -server (via the <code class="filespec">/etc/X11/XF86Config</code> file) to use -the <code class="filespec">/dev/gpmdata</code> device file as its mouse device. +server (via the <code class="filespec">/etc/X11/XF86Config</code> or <code +class="filespec">/etc/X11/xorg.conf</code> file) to use the <code +class="filespec">/dev/gpmdata</code> device file as its mouse device. The <code class="command">gpm</code> program documentation has more information about this. Alternatively, if this does not work or if you do not feel you need the mouse in text mode, simply remove or disable the <code @@ -1978,8 +1987,9 @@ installed. Install it.</li> <li>You don't have a valid <code class="other">FontPath</code> in your <code - class="filespec">/etc/X11/XF86Config</code> or <code - class="filespec">/etc/X11/XF86Config-4</code> file. At the very minimum, your + class="filespec">/etc/X11/XF86Config</code>,<code + class="filespec">/etc/X11/XF86Config-4</code> or <code + class="filespec">/etc/X11/xorg.conf</code> file. At the very minimum, your <code class="other">FontPath</code> should look something like this: <samp>FontPath "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/75dpi/"</samp> @@ -2036,16 +2046,19 @@ <ol> <li>pass the <kbd>-dpi</kbd> option to the X server (this also works for many - non-XFree86 X servers); or</li> - <li>let the XFree86 X server calculate the DPI value based on the DisplaySize - parameter in its configuration file, <code - class="filespec">XF86Config-4</code>. See the <code - class="manpage">XF86Config-4(5x)</code> manual page for details.</li> + non-XFree86/Xorg X servers); or</li> + <li>let the XFree86/Xorg X server calculate the DPI value based on the + DisplaySize parameter in its configuration file, <code + class="filespec">XF86Config-4</code> or <code + class="filespec">xorg.conf</code>. See the <code + class="manpage">XF86Config-4(5x)</code> or <code + class="manpage">xorg.conf(5x)</code> manual page for details.</li> </ol> <p>The first method is recommended if you already know the DPI value of your monitor and wish to always run it at the same resolution; the second method is -the more flexible way, but only available for the XFree86 X server.</p> +the more flexible way, but only available for the XFree86 and Xorg X +servers.</p> <p>Locate and edit the scripts which start the X server:</p> @@ -2072,12 +2085,12 @@ <p>In each of these files above, replace the value after -dpi with the correct number.</p> -<h4>Letting the XFree86 X server calculate the DPI:</h4> +<h4>Letting the XFree86/Xorg X server calculate the DPI:</h4> <p>In each of the files above, remove the <kbd>-dpi</kbd> word and the following -number. Then edit <code class="filespec">/etc/X11/XF86Config-4</code> and -locate the <code class="other">Monitor</code> section there. Add a line -like:</p> +number. Then edit <code class="filespec">/etc/X11/XF86Config-4</code> or +<code class="filespec">/etc/X11/xorg.conf</code> and locate the <code +class="other">Monitor</code> section there. Add a line like:</p> <pre>DisplaySize 288 216</pre> @@ -2112,14 +2125,15 @@ xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.</pre> <p>I'll also note that recent versions of the Debian XFree86 packages (upstream -version 4.1 and later) feature the <code class="package">x-window-system</code> -metapackage which relieves the user from having to have a full command of the -interrelationships between the many XFree86 binary packages. So, when you don't -understand why a given package relationship doesn't exist (why, for instance, -Debian doesn't force the installation of an X server along with X clients, or -vice-versa), it may be a good idea to just install the <code -class="package">x-window-system</code> package, which will probably give you the -files you want — from the XFree86 packages, anyway.</p> +version 4.1 and later) and the Debian X.Org packages feature the <code +class="package">x-window-system</code> metapackage which relieves the user from +having to have a full command of the interrelationships between the many +XFree86 or X.Org binary packages. So, when you don't understand why a given +package relationship doesn't exist (why, for instance, Debian doesn't force the +installation of an X server along with X clients, or vice-versa), it may be a +good idea to just install the <code class="package">x-window-system</code> +package, which will probably give you the files you want — from the +XFree86 or X.Org packages, anyway.</p> <h3><a id="singlequote">Why does the "single-quote" (') symbol in the fonts not look the way it used to?</a></h3> @@ -2193,8 +2207,8 @@ (or may already be available by the time you read this).</p> <p>It is not — repeat <strong>not</strong> — a bug in the X server, -the X libraries, the X fonts, or anything having to do with the XFree86 -packages.</p> +the X libraries, the X fonts, or anything having to do with the XFree86 or +X.Org packages.</p> <p>The long answer, courtesy of Markus Kuhn (from <a href="http://www.xfree86.org/pipermail/fonts/2001-March/000569.html">http://www.xfree86.org/pipermail/fonts/2001-March/000569.html</a>):</p> @@ -2464,25 +2478,26 @@ driver module or NVidia's proprietary <code class="other">nvidia</code> driver module; what's going on?</a></h3> -<p>Debian cannot officially support proprietary XFree86 driver modules such as -these for a few reasons:</p> +<p>Debian cannot officially support proprietary X.Org driver modules +such as these for a few reasons:</p> <ol> <li>In some cases, we don't ship them (usually because we cannot, as the license prevents us from doing so);</li> - <li> they're not part of XFree86, but third-party add-ons;</li> + <li> they're not part of X.Org, but third-party add-ons;</li> <li>(most importantly) we don't have the source code, so we cannot find and - fix bugs in them — neither can (in general) the authors of XFree86 + fix bugs in them — neither can (in general) the authors of X.Org itself.</li> </ol> <p>That said, one common problem with these proprietary modules is that you're -using a newer version of the XFree86 X server than the module was compiled for. -Take a look at your XFree86 log file, which is in the <code +using a newer version of the X.Org X server than the module was +compiled for. +Take a look at your X log file, which is in the <code class="filespec">/var/log</code> directory. The file name is often <code -class="filespec">/var/log/XFree86.0.log</code> (the number will be be different +class="filespec">/var/log/Xorg.0.log</code> (the number will be be different if the X server with a different server number, e.g. <code -class="filespec">XFree86.1.log</code> for <kbd>DISPLAY=:1</kbd>.)</p> +class="filespec">Xorg.1.log</code> for <kbd>DISPLAY=:1</kbd>.)</p> <p>Here's an example of server/driver version mismatch:</p> @@ -2502,7 +2517,7 @@ take:</p> <ol> - <li>downgrade the <code class="package">xserver-xfree86</code> package to a + <li>downgrade the <code class="package">xserver-xorg</code> package to a version compatible with the driver (this may not be possible depending on what is available on the Debian mirror network);</li> <li>contact the technical support service of the company distributing the @@ -2510,9 +2525,9 @@ version of the module;</li> <li>remove the proprietary server module and use free alternatives, such as the <code class="other">mga</code> or <code class="other">nv</code> drivers - that ship as part of the <code class="package">xserver-xfree86</code> package - — you may need to use the <kbd>dpkg-reconfigure xserver-xfree86</kbd> - command or edit the <code class="filespec">/etc/X11/XF86Config-4</code> file + that ship as part of the <code class="package">xserver-xorg</code> package + — you may need to use the <kbd>dpkg-reconfigure xserver-xorg</kbd> + command or edit the <code class="filespec">/etc/X11/xorg.conf</code> file to instruct the X server to use the free modules.</li> </ol> @@ -2541,7 +2556,7 @@ Mac and the output of <kbd>uname -m</kbd> command is not <samp>ppc</samp>), you should reconfigure the X server to use <code class="other">macintosh_old</code> for your <code class="other">XkbModel</code>. One way to do this with the -command <kbd>dpkg-reconfigure xserver-xfree86</kbd> as the root user.</p> +command <kbd>dpkg-reconfigure xserver-xorg</kbd> as the root user.</p> <p>As of 4 March 2003, no kernels with the feature of sending Linux keycodes are in stable release for m68k-based Macintoshes.</p> @@ -2650,17 +2665,17 @@ <p><em>This entry was written by <a href="mailto:walters@debian.org">Colin Walters</a>.</em></p> -<p>In the Debian packages of XFree86, some important variables affecting the +<p>In the Debian packages of X.Org, some important variables affecting the startup of the X server are located in <code class="filespec">/etc/X11/Xwrapper.config</code>. In this particular case, you must change the option <var>allowed_users</var> to either <code class="other">console</code> or <code class="other">anybody</code>. See <code class="manpage">Xwrapper.config(5)</code> for more information and examples.</p> -<h3><a id="confmanagment">How do the XFree86 packages manage their non-conffile +<h3><a id="confmanagment">How do the X.Org packages manage their non-conffile configuration files like <code class="filespec">/etc/X11/X</code>, <code class="filespec">/etc/X11/Xwrapper.config</code>, and <code -class="filespec">/etc/X11/XF86Config-4</code>?</a></h3> +class="filespec">/etc/X11/xorg.conf</code>?</a></h3> <p>First, a note on terminology: <em>conffile</em> is a Debian term for a configuration file that is shipped as part of a package's payload. Non-conffile @@ -2680,7 +2695,7 @@ version of the configuration file.</p> <p>The <code class="filespec">Xwrapper.config</code> and <code -class="filespec">XF86Config-4</code> files' checksums are based upon their file +class="filespec">xorg.conf</code> files' checksums are based upon their file contents. <code class="filespec">/etc/X11/X</code> is a symbolic link, so its checksum is based on the output of the <code class="command">readlink</code> command when run against that file. The checksums are stored in <code @@ -2690,8 +2705,8 @@ <p>The post-installation scripts of the <code class="package">xserver-common</code>, <code -class="package">xserver-xfree86</code>, and <code -class="package">xserver-xfree86-dbg</code> packages will not overwrite the +class="package">xserver-xorg</code>, and <code +class="package">xserver-xorg-dbg</code> packages will not overwrite the aforementioned non-conffile configuration files if <em>any</em> of the following conditions is met:</p> @@ -2724,10 +2739,10 @@ her desire to have the packaging system abandon control of the file.</p> <p>People writing installers for the Debian OS should note that -pre-configuration of the XFree86 X server is now as simple as creating an <code +pre-configuration of the Xorg X server is now as simple as creating an <code class="filespec">/etc/X11/X</code> symlink and <code -class="filespec">/etc/X11/XF86Config</code> file before installing the <code -class="package">xserver-xfree86</code> package. The presence of these files +class="filespec">/etc/X11/xorg.conf</code> file before installing the <code +class="package">xserver-xorg</code> package. The presence of these files causes the question priority of the package's <code class="other">debconf</code> questions to be capped at "medium"; the files' existence is regarded as defining a "reasonable default" to the corresponing <code class="other">debconf</code> @@ -2735,14 +2750,14 @@ <var>DEBIAN_PRIORITY</var> environment variable to "high" will bypass the asking of all X server-related debconf questions, and the existence of the <code class="filespec">/etc/X11/X</code> and <code -class="filespec">/etc/X11/XF86Config-4</code> files in the absence of stored +class="filespec">/etc/X11/xorg.conf</code> files in the absence of stored checksum files will prevent them from being overwritten by maintainer scripts.</p> <h3><a id="forceoverwriteconf">I've customized my <code class="filespec">/etc/X11/X</code>, <code class="filespec">/etc/X11/Xwrapper.config</code>, and/or <code -class="filespec">/etc/X11/XF86Config-4</code> files so the packages don't +class="filespec">/etc/X11/xorg.conf</code> files so the packages don't automatically update them anymore. I'd like them automatically managed again, though; how can I achieve that?</a></h3> @@ -2757,19 +2772,19 @@ <p>For <code class="filespec">/etc/X11/X</code>, do the following as root:<br /> <kbd>readlink /etc/X11/X | md5sum > /var/lib/xfree86/X.md5sum<br /> -dpkg-reconfigure xserver-xfree86</kbd></p> +dpkg-reconfigure xserver-xorg</kbd></p> -<p>(You may have <code class="package">xserver-xfree86-dbg</code> installed +<p>(You may have <code class="package">xserver-xorg-dbg</code> installed instead, in which case, run <code class="command">dpkg-reconfigure</code> on that package instead.)</p> -<p>For <code class="filespec">/etc/X11/XF86Config-4</code>, do the following as +<p>For <code class="filespec">/etc/X11/xorg.conf</code>, do the following as root:<br /> -<kbd>md5sum /etc/X11/XF86Config-4 > -/var/lib/xfree86/XF86Config-4.md5sum<br /> -dpkg-reconfigure xserver-xfree86</kbd></p> +<kbd>md5sum /etc/X11/xorg.conf > +/var/lib/xfree86/xorg.conf.md5sum<br /> +dpkg-reconfigure xserver-xorg</kbd></p> -<p>(You may have <code class="package">xserver-xfree86-dbg</code> installed +<p>(You may have <code class="package">xserver-xorg-dbg</code> installed instead, in which case, run <code class="command">dpkg-reconfigure</code> on that package instead.)</p> @@ -2783,45 +2798,37 @@ and reinstall them, but that can be considerably more disruptive. Nevertheless, here's an example (like the commands above, it must be run as root):<br /> -<kbd>dpkg --purge xserver-common xserver-xfree86 xserver-xfree86-dbg<br /> -apt-get install xserver-common xserver-xfree86 xserver-xfree86-dbg</kbd></p> +<kbd>dpkg --purge xserver-common xserver-xorg xserver-xorg-dbg<br /> +apt-get install xserver-common xserver-xorg xserver-xorg-dbg</kbd></p> <p>Omit one or more of the package names in these commands if you only want to use this method on some of the configuration files. <code class="package">xserver-common</code> deals with <code class="filespec">/etc/X11/Xwrapper.config</code>, and <code -class="package">xserver-xfree86</code> and <code -class="package">xserver-xfree86-dbg</code> share <code +class="package">xserver-xorg</code> and <code +class="package">xserver-xorg-dbg</code> share <code class="filespec">/etc/X11/X</code> and <code -class="filespec">/etc/X11/XF86Config-4</code>.</p> +class="filespec">/etc/X11/xorg.conf</code>.</p> <h3><a id="addcustomsect">How do I add custom sections to a <code class="command">dexconf</code>-generated <code -class="filespec">XF86Config</code> or <code class="filespec">XF86Config-4</code> -file?</a></h3> - -<p>For XFree86 3.x servers (which are <a href="#xfree86_3x">no longer -supported</a>), this is mostly useful for adding <code -class="other">XInput</code> and <code class="other">ServerFlags</code> sections, -and for replacing the <code class="other">Files</code> and <code -class="other">Modules</code> sections with something more to the user's -liking.</p> +class="filespec">xorg.conf</code> file?</a></h3> -<p>For the XFree86 4.x X server, you likely do not want to instruct <code +<p>You likely do not want to instruct <code class="command">dexconf</code> to overwrite your existing <code -class="filespec">XF86Config-4</code> file if you have modified it. The Debian +class="filespec">xorg.conf</code> file if you have modified it. The Debian package maintainer scripts will not overwrite the file if they detect that you -have modified the file (see <a href="#confmanagment">How do the XFree86 packages +have modified the file (see <a href="#confmanagment">How do the X.Org packages manage their non-conffile configuration files like <code class="filespec">/etc/X11/X</code>, <code class="filespec">/etc/X11/Xwrapper.config</code>, and <code -class="filespec">/etc/X11/XF86Config-4</code>?</a> above).</p> +class="filespec">/etc/X11/xorg.conf</code>?</a> above).</p> -<p>Since the Debian XFree86 packages' <code class="other">debconf</code> +<p>Since the Debian X.Org packages' <code class="other">debconf</code> questions are not intended to be fully-featured X server configuration tools, but merely to collect enough information to achieve a working single-headed setup, you may find that you wish to customize the generated <code -class="filespec">XF86Config-4</code> file by editing any of the existing +class="filespec">xorg.conf</code> file by editing any of the existing sections written by <code class="command">dexconf</code> or by adding an arbitrary number of supplementary <code class="other">Device</code>, <code class="other">InputDevice</code>, <code class="other">Monitor</code>, <code @@ -2841,9 +2848,9 @@ questions associated with it) does not support the plethora of possible options (many of them driver-specific), because it is not a very ambitious tool.</p> -<p>The number one fact to remember about the XFree86 4.x server is that the +<p>The number one fact to remember about the Xorg X server is that the first <code class="other">ServerLayout</code> section encountered in the <code -class="filespec">XF86Config-4</code> file is the one that is used by default. +class="filespec">xorg.conf</code> file is the one that is used by default. It is, of course, possible to add the <kbd>-layout</kbd> option to server invocations, either manually or by configuring <code class="command">xdm</code> or <code class="command">xinit</code> to do so by default (e.g., by editing the @@ -2858,7 +2865,7 @@ class="other">ServerLayout</code> section to bind the <code class="other">Screen</code> to input devices. If I want my new <code class="other">ServerLayout</code> to be the default, I'll put it at the top of -the <code class="other">XF86Config-4</code> file, before the <code +the <code class="other">xorg.conf</code> file, before the <code class="other">debconf</code> area. The <code class="other">Device</code> and <code class="other">Screen</code> sections can go either before or after the <code class="other">debconf</code> area, but I'll put them before just to keep @@ -2900,10 +2907,8 @@ InputDevice "Configured Mouse" "CorePointer" EndSection</pre> -<p>See the <code class="manpage">XF86Config-v3(5x)</code> manual page for more -information on XFree86 3.x X server configuration, and <code -class="manpage">XF86Config-4(5x)</code> for more information on XFree86 4.x X -server configuration.</p> +<p>See the <code class="manpage">xorg.conf(5x)</code> manual page for more +information on Xorg X server configuration.</p> <h3><a id="nodrinotfatal">The X server log says there was an error and it's disabling DRI. Is that why the X server won't start?</a></h3> @@ -2926,7 +2931,7 @@ usually aren't if they're not accompanied by a <q>failure to initialize core devices</q> message.</p> -<p>If you have non-USB mouse configured, the Debian default XFree86 X server +<p>If you have non-USB mouse configured, the Debian default Xorg X server configuration sets up an extra input device so that you can just plug a USB mouse in to one of your USB ports (if you have any) and use it as well.</p> @@ -2941,17 +2946,17 @@ <kbd>X :50 -allowMouseOpenFail</kbd></p> <p>See the <code class="manpage">Xserver(1x)</code> and <code -class="manpage">XFree86(1x)</code> manual pages for more information.)</p> +class="manpage">Xorg(1x)</code> manual pages for more information.)</p> <p>If the X server does not start, then the mouse device is not your problem. Search the X server's log (in the above examples, <code -class="filespec">/var/log/XFree86.0.log</code> or <code -class="filespec">/var/log/XFree86.50.log</code>) for other errors.</p> +class="filespec">/var/log/Xorg.0.log</code> or <code +class="filespec">/var/log/Xorg.50.log</code>) for other errors.</p> <p>If the X server <em>does</em> start, then you <em>do</em> have a mouse -problem. Use <kbd>dpkg-reconfigure xserver-xfree86</kbd> to correct the +problem. Use <kbd>dpkg-reconfigure xserver-xorg</kbd> to correct the configuration of your mouse. The <code class="package">mdetect</code> package -and utility of the same name may help you to determine how the XFree86 X server +and utility of the same name may help you to determine how the Xorg X server should be configured in this regard. Install the package and run the following command:<br /> <kbd>mdetect -x</kbd></p> @@ -3032,7 +3037,7 @@ However, the advice in this section is intended for all dual-head ATI Radeon users.</p> -<p>In your <code class="filespec">/etc/X11/XF86Config-4</code> file, you may +<p>In your <code class="filespec">/etc/X11/xorg.conf</code> file, you may need to use the <code class="other">MonitorLayout</code> option in each of the <code class="other">Device</code> sections corresponding to the "heads" (monitors) being driven by the video card. This option is documented in the @@ -3265,7 +3270,7 @@ <p>See <code class="manpage">xkbcomp(1x)</code> and <code class="manpage">Xserver(1x)</code> for more information.</p> -<h3><a id="debugxserver">How can I help debug the XFree86 X server?</a></h3> +<h3><a id="debugxserver">How can I help debug the Xorg X server?</a></h3> <p>You can often help Debian and upstream driver maintainers fix problems by narrowing down exactly where a crash or lockup is. You don't need to do this @@ -3276,10 +3281,10 @@ filed against a package.</p> <p>The first thing to do is to see if you can reproduce the problem with the -<code class="package">xserver-xfree86-dbg</code> package. Install the +<code class="package">xserver-xorg-dbg</code> package. Install the package and tell <code class="other">debconf</code> you want to use that X server. Then restart the X server and try to reproduce the bug (hopefully, this -is easy). If it doesn't crash, let us know. If a bug is in the XFree86 X +is easy). If it doesn't crash, let us know. If a bug is in the Xorg X server's ELF module loader, you likely won't see it when you use the debugging server. Debian still wants to know that information. If it does crash, become <code class="other">root</code>, enable core dumps (<kbd>ulimit -c @@ -3311,7 +3316,7 @@ <p>Next, run the GNU Debugger, GDB (from the <code class="package">gdb</code> package), on the <code class="filespec">core</code> file and <code -class="filespec">XFree86-debug</code> executable. The information of most +class="filespec">Xorg-debug</code> executable. The information of most interest to us is a backtrace of execution. The X server has a signal handler in it so it can do things like exit gracefully (restoring the text console, and so forth), so we're not actually interested in all the stack frames — just @@ -3320,7 +3325,7 @@ <p>Here's an example GDB session I logged after provoking an artificial server crash (with <kbd>kill -SEGV</kbd>).</p> -<pre> % gdb $(which XFree86-debug) core +<pre> % gdb $(which Xorg-debug) core GNU gdb 6.1-debian Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are @@ -3418,15 +3423,15 @@ replace the name of the core file with a process ID when invoking GDB.</p> <p>For example, here's a partial transcript of this procedure with an <code -class="command">XFree86-debug</code> X server running in its normal event loop +class="command">Xorg-debug</code> X server running in its normal event loop (which is the code it executes while waiting for something to do). Typically, the result of a backtrace when the X server is wedged, stuck, or hung will look somewhat different.</p> -<pre> # ps -fC XFree86-debug +<pre> # ps -fC Xorg-debug UID PID PPID C STIME TTY TIME CMD - root 32410 32406 4 13:12 ? 00:00:00 XFree86-debug :1 vt10 - 506 {0} root@sisyphus:~# gdb $(which XFree86-debug) 32410 + root 32410 32406 4 13:12 ? 00:00:00 Xorg-debug :1 vt10 + 506 {0} root@sisyphus:~# gdb $(which Xorg-debug) 32410 GNU gdb 6.3-debian Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are @@ -3435,7 +3440,7 @@ There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "powerpc-linux"...Using host libthread_db library "/lib/libthread_db.so.1". - Attaching to program: /usr/X11R6/bin/XFree86-debug, process 32410 + Attaching to program: /usr/X11R6/bin/Xorg-debug, process 32410 Reading symbols from /usr/lib/libfreetype.so.6...done. Loaded symbols for /usr/lib/libfreetype.so.6 Reading symbols from /usr/lib/libz.so.1...done.</pre> @@ -3527,15 +3532,15 @@ <li> <p>To rule out problems with the X server's portions of DRI, disable the <code class="other">Load "dri"</code> line in your <code - class="filespec">/etc/X11/XF86Config-4</code> file. There are two ways to - do this; you can run <kbd>dpkg-reconfigure xserver-xfree86</kbd> and remove + class="filespec">/etc/X11/xorg.conf</code> file. There are two ways to + do this; you can run <kbd>dpkg-reconfigure xserver-xorg</kbd> and remove <code class="other">dri</code> from the list of modules to be loaded, or you - can simply open <code class="filespec">/etc/X11/XF86Config-4</code> with + can simply open <code class="filespec">/etc/X11/xorg.conf</code> with your favorite text editor and comment the line out by putting a hash mark (<kbd>#</kbd>) at the beginning of it.</p> <p>If doing the above resolves the problem but the previous step did not, you have found a problem in the X server's portions of DRI; file a bug against <code - class="package">xserver-xfree86</code> and report your findings.</p> + class="package">xserver-xorg</code> and report your findings.</p> </li> <li> <p>Occassionally people find that problems with 3D acceleration appear and @@ -3543,7 +3548,7 @@ particularly been seen in the 2.6.<em>x</em> kernel series.) While aggressive switching of kernel versions is not a process for the faint of heart, if you have upgraded your kernel recently but have not upgraded - XFree86, and are finding that X has "suddenly broken" despite not being + X.Org, and are finding that X has "suddenly broken" despite not being upgraded, you're most likely dealing with a Linux kernel problem. Try downgrading your Linux kernel to the version you were using before to confirm the fact; if you can confirm it, file a bug against <code @@ -3559,7 +3564,7 @@ class="package">xlibmesa-dri</code>.</li> <li>you don't have the <code class="package">xlibmesa-dri</code> package installed, then file your bug report against <code - class="package">xserver-xfree86</code>.</li> + class="package">xserver-xorg</code>.</li> </ul> </li> </ol>
Attachment:
signature.asc
Description: Digital signature