X Strike Force XFree86 SVN commit: r2198 - in branches/4.3.0/sid/debian: . local patches
Author: branden
Date: 2005-02-18 14:41:26 -0500 (Fri, 18 Feb 2005)
New Revision: 2198
Added:
branches/4.3.0/sid/debian/patches/099w_fix_XGetWProp_manpage.diff
Modified:
branches/4.3.0/sid/debian/CHANGESETS
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/local/FAQ.xhtml
branches/4.3.0/sid/debian/xdm.postrm.in
branches/4.3.0/sid/debian/xfree86-common.postrm.in
Log:
Merge revisions 2186:HEAD from trunk in preparation for 4.3.0.dfsg.1-12
release.
Modified: branches/4.3.0/sid/debian/CHANGESETS
===================================================================
--- branches/4.3.0/sid/debian/CHANGESETS 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/CHANGESETS 2005-02-18 19:41:26 UTC (rev 2198)
@@ -9,310 +9,23 @@
files anywhere.)
Miscellaneous cosmetic fixes.
- 2126, 2138, 2147, 2148, 2164, 2168, 2175, 2176, 2183
+ 2191, 2192, 2194
-The loading of srvr_ctrl(xfree86) symbol definitions for Sun keyboards
-was broken and made such keyboards unusable. (Closes: #286268)
- 2079, 2085
+Fix xfree86-common and xdm's postrm scripts to shunt update-rc.d's
+standard output to /dev/null; the #DEBHELPER# expando causes the postrm to
+be re-executed with the debconf frontend, which is notorious for mistaking
+anything that appears on standard output as food, and is confused by
+update-rc.d's unconditional chattery spew. Thanks to Adam Conrad and
+Steve Lanagasek for walking me through the issue on IRC.
+(Closes: #295175)
+ 2195
-Overhaul Xnest(1x) manpage. Among other cleanups:
-+ Fix documented syntax of the "-geometry" option's argument.
- (Closes: #282760)
- 2080
+Fix missing .HP tag in XGetWindowProperty() (et al.) manpage. Thanks to
+Tollef Fog Heen for bringing this to my attention.
+ 2196
-Drop run_parts() function in Xsession scripts in favor of "run-parts
---list". Update Xsession(5) manual page accordingly. Increment
-xfree86-common's versioned dependency on debianutils from (>= 1.13) to
-(>= 1.16.9). (Closes: #283764)
- 2083
+Update FAQ entry "How can I help debug 3D acceleration problems?" per
+feedback from Michel Dänzer.
+ 2197
-Implement koi8rxterm, a uxterm-like wrapper for KOI8-R locales. Ship
-script, manual page, and app-defaults file. Update MANIFEST files.
-Update xterm's package description and add a Suggests: on xfonts-cyrillic.
-Register koi8rxterm as x-terminal-emulator alternative (priority of 20,
-same as xterm itself). Deregister koi8rxterm as alternative when the
-package is removed. (Closes: #173565)
- 2086, 2087, 2088, 2089, 2092, 2093, 2094, 2095, 2098, 2099, 2100
-
-Expand and update uxterm(1x) manual page.
- 2097
-
-Implement lxterm, a simple wrapper that chooses whether to launch xterm,
-koi8rxterm, or uxterm based on the output of "locale charmap". Ship
-script and manual page. Update MANIFEST files. Update xterm's package
-description. Register lxterm as an x-terminal emulator alternative,
-giving it a priority of 30. Lower uxterm's alternative priority to 20.
-Deregister lxterm as an alternative when the package is removed.
-(Closes: #279252)
- 2101
-
-Apply patch from Bjorn Helgaas to fix SEGV in ati/radeon driver that
-occurs when RADEONQueryConnectedDisplays() calls vbeDoEDID() but the
-latter function returns NULL. Thanks, Bjorn! (Closes: #284025)
- 2102
-
-Make keypad delete key <KPDL> generate KP_Separator, not comma, in
-Brazilian XKB layouts (thanks, Rafael Ávila de Espíndola). Update patch
-#099z_xkb_level3_ralt_switch. (Closes: #286667)
- 2105, 2119
-
-Tighten the OSMesa library's dependencies on Mesa, because OSMesa depends
-on private _glapi* functions exported only by the Mesa version of the GL
-library. Add exact versioned dependency of xlibosmesa4 on "xlibmesa-gl (=
-${Source-Version)", and replace xlibosmesa-dev's dependency on "libgl-dev"
-with "xlibmesa-gl-dev (= ${Source-Version). Thanks to Marcelo Magallon
-for pointing this out. (Closes: #287612)
- 2106
-
-Apply Jan Wilhelm Stumpel's fix for the en_US.UTF-8 Compose map in
-4.3.0.dfsg.1-9 to pt_BR.UTF-8 as well.
- 2107
-
-Add FAQ entry: How can I set up my X server or X terminal to use XKB
-without any X libraries or XKB data installed?
- 2108
-
-Remove broken hyperlink to freedesktop.org in the FAQ. Thanks to Loïc
-Minier for pointing this out. (Closes: #285222)
- 2109, 2115, 2118
-
-Update information in the FAQ regarding problems GNU Emacs, XEmacs,
-Openbox, and Sawfish have with XKB's "fake keys". Retitle entry from "My
-keyboard configuration worked with XFree86 4.2; why is it messed up now?"
-to "My keyboard configuration worked with previous versions of XFree86;
-why is it messed up now? For example, my Windows keys don't work right in
-Emacs or my window manager anymore."
- 2110, 2113, 2146
-
-Remove spurious quotes from variable expansions of $XVFBARGS and
-$LISTENTCP in xvfb-run. Thanks to Jeff Lessem for the patch!
-(Closes:# 286181)
- 2115
-
-Add patch by Timothy Baldwin to evdev support to fix broken backslash
-keys. (Closes: #266274)
- 2117
-
-Fix xserver-xfree86's configure script to not die if Discover 1.x's
-discover command segfaults. Thanks to Kyle McMartin for reporting this
-problem and testing the fix. (Closes: #291722)
- 2120, 2163
-
-Add more cleanups and enchancements to xdm in patch #002:
-+ Actually attempt to write data to the auth file in
- SaveServerAuthorizations(); that way we detect problems like ENOSPC
- (full filesystem, user over quota) early enough to do something about
- it. (Closes: #217505, #253480)
-+ Add comments documenting race-based symlink attack prevention
- techniques when creating files.
-+ Add more detailed debugging and logging of errors when replacing
- authorization files in SetUserAuthorization() and
- RemoveUserAuthorization().
-+ Add RemovePid() function (which removes the pidFile), and register it
- with atexit(). (Closes: #213076)
-+ Add more debugging to execute().
-+ Use the term "process ID" instead of "process-id".
-Update the stillrunning() function in xdm's init script to remove a
-known-stale /var/run/xdm.pid file if it is present. Stop removing the
-daemon-not-stopped file, as code removing it is run elsewhere. Stop
-forcing the script to exit if given the "stop" argument and the daemon is
-assumed to not be running due to no process ID file being found (this
-would cause "restart" to fail to start the daemon in this case). Remove
-the "daemon-not-stopped" flag file if asked to stop the daemon and it
-either appears to not be running, or was successfully stopped. Update and
-clarify comments in xdm's init script.
- 2121, 2143
-
-Fix typo in German debconf template translations. Thanks, Georg Neis!
-(Closes: #289508)
- 2123
-
-Permit lower pixel clocks (less than 17.75 MHz, but greater than 12 MHz)
-on older (Millenium, Mystique) Matrox cards. Thanks to Jan Gorski for
-supplying information (updates fix for #261993).
- 2124
-
-Fix the tdfx driver to stop failing to explain why some modes are
-rejected. If TDFXValidMode() would return MODE_BAD, use xf86DrvMsg() to
-document the reason.
- 2125, 2132
-
-Fix xlsfonts, xprop, xwd, and xwininfo to not bleat a usage message when
-XOpenDisplay() fails. Being unable to connect to the X server is an
-operational error, not a user-input error.
- 2128, 2129, 2130
-
-Add patch from Manoj Srivastava that implements support for SELinux in
-imake and xdm. (Note that this patch only adds source-level support, and
-does not actually enable it.) Thanks, Manoj! (Closes: #233551)
- 2133
-
-Update patch #007 to fix the problem with XFree86-authored manpages
-reporting "Version Version ..." in the footer.
- 2134, 2135
-
-Update XTerm to patch #198 (2004-01-13) from Thomas Dickey's website.
-+ Make active-icon work properly when TrueType fonts are used.
- (Closes: #286068)
-Resync patches #059, #803, and #907.
- 2136
-
-Move the debhelper expando to immediately precede exit in maintainer
-scripts, except where (as in the case of xdm and xfs), we use flag files
-that indicate when the installation is over. In those cases, place the
-expando immediately before removal of such files.
- 2137, 2140
-
-Add copyright notice and GPL license boilerplate to init scripts.
- 2139
-
-Update XTerm to patch #199 (2004-01-17) from Thomas Dickey's website.
- 2141
-
-Enhance xserver-common's preinst script to support upgrades from package
-versions between 4.0.1-6 and 4.2.1-10 (thanks, Brian Sammon).
-(Closes: #267503)
- 2142
-
-Update patch #087 (XPM library security fixes) to revert regressions in
-functionality caused by overly aggressive validation of filespec strings
-in OpenReadFile() and OpenWriteFile(). (Closes: #286164)
- 2145
-
-The basic variant of 'us' layout was not displayed by kxkb because its
-'hidden' attribute was wrongly set. Thanks, Frans Pop! (Closes: #290935)
- 2149, 2150
-
-Add more clearnups and enhancements to xfs in patch #003b:
-+ Add RemovePid() function which removes the process ID file, and register
- it with atexit() so that it is automatically invoked when xfs exits.
-+ Refer to "user ID" and "process ID" in diagnostic messages, not "userid"
- and "process-id".
-+ Remove duplicate unconditional #include of stdlib.h.
-+ Wrap long lines.
-+ Add "FUTURE DIRECTIONS" section to manpage.
-+ Perform massive cleanup and reformatting of manpage.
-Update xfs's init script:
-+ Modify the stillrunning() function in to remove a known-stale /var/run/xfs.pid
- file if it is present.
-+ Stop removing the daemon-not-stopped file, as code removing it is run
- elsewhere.
-+ Stop forcing the script to exit if given the "stop" argument and the daemon is
- assumed to not be running due to no process ID file being found (this would
- cause "restart" to fail to start the daemon in this case).
-+ Remove the "daemon-not-stopped" flag file if asked to stop the daemon and it
- either appears to not be running, or was successfully stopped.
-+ Update and clarify comments.
- 2151
-
-Add __attribute__ ((packed)) to declaration of XChar2b structure in
-Xlib.h, for GCC/ARM systems only. This is a kludge to work around a bad
-design decision in the GCC ARM ABI, and has been discussed with Jim
-Gettys, Keith Packard, and Phil Blundell. Thanks to Nicolas George and
-Gaëtan LEURENT for bringing this issue to my attention. (Closes: #285396)
- 2153
-
-Fix the "Advanced" monitor selection method in xserver-xfree86's config
-script to use the monitor sync ranges autodetected by read-edid, if
-available. Thanks to Jay Birkenbilt for the patch. (Closes: #229850)
- 2159
-
-Reimplement mkdirhier and rewrite its manual page.
-+ No longer adds extraneous leading slashes to filespecs.
- (Closes: #141347)
-+ No longer creates spurious levels of directory hierarchy.
- (Closes: #232357)
- 2161, 2170, 2171
-
-Grab patch from X.Org CVS (via Jan Kreuzer) to increase DDC retry delay a
-little bit, which permits DDC probing to succeed on some hardware
-configurations where it would otherwise fail. Thanks, Jan!
-(Closes: #291243)
- 2162
-
-Update FAQ entry "What is the story with XFree86 3.x?" to mention the Xsun
-X server packages.
- 2165
-
-Stop using the "local" keyword in /bin/sh scripts -- it turns out "local"
-is not POSIX, but posh -n won't tell you that as it doesn't do a syntax
-parse on function bodies, which is the only place that keyword makes
-sense. Comment out this usage instead of removing it as a means of
-stoking my likely-futile hopes that the Debian Policy Manual will carve
-out another exception to POSIX compliance for /bin/sh scripts in this
-area. A language with only global scope for variables scarcely bears
-thinking about. Thanks to Clint Adams for pointing out this unfiled RC
-bug, and to Steve Langasek for hounding me incessantly about it.
- 2166
-
-Replace post-processed comments with pre-processed ones in patch #096;
-this quiets build-time warnings. Also document why this patch is not yet
-suitable for submission to upstream.
- 2167
-
-In xserver-xfree86's config script, if the discover, mdetect, or get-did
-(from the read-edid package) commands are not available, set the
-corresponding autodetection question to false and mark it as seen. That
-way, if one of the hardware detection packages is subsequently installed,
-the user is not confusingly shown a "do autodection?" debconf question,
-and then nothing done about the answer.
- 2169
-
-Fix validate-posix-sh script to stop pretending that ash and dash are
-different shells -- in Debian, they're not.
- 2172
-
-Update XTerm to patch #200 (2005-02-06) from Thomas Dickey's website.
-+ Fix a regression from patch #197 which disowned the selection if it was
- scrolled, e.g., by the user pressing return at the bottom of the screen.
- (Closes: #277832, #291787)
- 2173
-
-Apply patch from Steve Langasek to drop the xprt package, and stop
-building the Xprt X server, since this functionality did not work in any
-version of XFree86 up to 4.3.0, and has moved to the xprt-xprintorg
-package. (The client-side Xp library is still built.) Thanks, Steve!
-+ Update patch #003 to #define XprtServer NO and BuildXprintLib YES on
- Debian systems. Resync patches #004, #099c, #099s, and #600.
-+ Update rules file to stop turning off the build of Xprt in the server
- debug target, since that's now redundant.
-+ Update MANIFEST files to reflect the fact that Xprt is no longer built.
-+ Remove xprt package's stanza from debian/control.
-+ Remove debian/xprt.install debhelper file.
-Remove delcaration of non-DFSG-freeness of the Compugraphic and Adobe
-fonts (shipped as part of the Xprt server) from debian/copyright. Update
-the prune-non-free script to stop removing these files from the upstream
-archive. Roland Mainz has argued fairly persuasively on the debian-x
-mailing list that the fonts were in fact freely licensed. In the event
-Mr. Mainz is wrong, the point is pretty close to void, since 1) Xprt is
-not being built or shipped anymore; 2) this change does not restore the
-files in question to the .orig.tar.gz; 3) the X Strike Force doesn't
-anticipate shipping these files in the future X.Org packages, either.
- 2174
-
-Update patch #071 to be sure to pass the mprotect() in
-ElfCollectSections() a page-aligned request (as the other use of
-mprotect(), in ELFCreateGot(), already does). This reportedly prevents
-SEGVs in the X server's ELF object loader on AMD64 systems. Thanks to
-Piotr Kaczuba for this information. (Closes: #277699 (again))
- 2178, 2180
-
-Add patch #099v by Guillem Jover to fix a SEGV in font server code
-shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
- 2181
-
-Migrate the bug scripts to the more sophisticated world order now in use.
-+ Move current scripts from /usr/share/bug/$PACKAGE to
- /usr/share/bug/$PACKAGE/script.
- 2182
-
-Write and ship a "presubj" bug message for the xserver-xfree86 package
-(also used by xserver-xfree86-dbg).
- 2184
-
-Add two entries to the FAQ:
-+ How can I help debug the XFree86 X server?
-+ How can I help debug 3D acceleration problems?
- 2185
-
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/TODO 2005-02-18 19:41:26 UTC (rev 2198)
@@ -14,14 +14,10 @@
scheduled. However, the package release manager can put an explicit freeze on
those by marking the package version section accordingly.
-4.3.0.dfsg.1-11
----------------
-
-4.3.0.dfsg.1-12
----------------
-
-* Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David
- Nusinow have provided good input.
+Post 4.3.0-1
+------------
+* Rewrite xserver-xfree86 debconfage, possibly as xserver-xorg debconfage. Joey
+ Hess, Eduard Bloch, and David Nusinow have provided good input.
+ udev users will have "/dev/input/mousen" -- configure that as only mouse
device? (see #237574)
+ #207481: xserver-xfree86: proposed debconf overhaul [BR]
@@ -52,8 +48,6 @@
+ Use /proc/hardware on m68k architecture to set a reasonable default mouse
port. See <URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html>.
-Post 4.3.0-1
-------------
* Should xc/include/{Xw32defs.h,Xwinsock.h} be installed (and shipped) for
the benefit of cross-compilers? Check upstream Imakeage.
* Why doesn't xc/include/extensions/xtestext1.h do something like this?:
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/changelog 2005-02-18 19:41:26 UTC (rev 2198)
@@ -1,3 +1,26 @@
+xfree86 (4.3.0.dfsg.1-11+SVN) unstable; urgency=medium
+
+ * Urgency set to medium due to fix for release-critical bug #295175
+ (xfree86-common fails to purge; see below).
+
+ Changes by Branden Robinson:
+
+ * Fix xfree86-common and xdm's postrm scripts to shunt update-rc.d's
+ standard output to /dev/null; the #DEBHELPER# expando causes the postrm to
+ be re-executed with the debconf frontend, which is notorious for mistaking
+ anything that appears on standard output as food, and is confused by
+ update-rc.d's unconditional chattery spew. Thanks to Adam Conrad and
+ Steve Lanagasek for walking me through the issue on IRC.
+ (Closes: #295175)
+
+ * Fix missing .HP tag in XGetWindowProperty() (et al.) manpage. Thanks to
+ Tollef Fog Heen for bringing this to my attention.
+
+ * Update FAQ entry "How can I help debug 3D acceleration problems?" per
+ feedback from Michel Dänzer.
+
+ -- Branden Robinson <branden@debian.org> Fri, 18 Feb 2005 13:39:21 -0500
+
xfree86 (4.3.0.dfsg.1-11) unstable; urgency=medium
* Urgency set to medium due to fix for release-critical bug #286181
@@ -51,7 +74,7 @@
on private _glapi* functions exported only by the Mesa version of the GL
library. Add exact versioned dependency of xlibosmesa4 on "xlibmesa-gl (=
${Source-Version)", and replace xlibosmesa-dev's dependency on "libgl-dev"
- with "xlibmesa-gl-dev (= ${Source-Version). Thanks to Marcelo Magallon
+ with "xlibmesa-gl-dev (= ${Source-Version)". Thanks to Marcelo Magallon
for pointing this out. (Closes: #287612)
* Apply Jan Wilhelm Stumpel's fix for the en_US.UTF-8 Compose map in
@@ -72,7 +95,7 @@
* Remove spurious quotes from variable expansions of $XVFBARGS and
$LISTENTCP in xvfb-run. Thanks to Jeff Lessem for the patch!
- (Closes:# 286181)
+ (Closes: #286181)
* Add patch by Timothy Baldwin to evdev support to fix broken backslash
keys. (Closes: #266274)
Modified: branches/4.3.0/sid/debian/local/FAQ.xhtml
===================================================================
--- branches/4.3.0/sid/debian/local/FAQ.xhtml 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/local/FAQ.xhtml 2005-02-18 19:41:26 UTC (rev 2198)
@@ -857,10 +857,10 @@
found in <code class="filespec">/etc/X11/app-defaults</code> (or a localized
subdirectory of <code class="filespec">/etc/X11</code>).</p>
-<p>App-defaults are specified using a class/instance syntax and look very similar
-to X resource files (<a href="#defresourc">see the previous question</a>), but
-there are three very important differences between app-defaults and X
-resources:</p>
+<p>App-defaults are specified using a class/instance syntax and look very
+similar to X resource files (<a href="#defresourc">see the previous
+question</a>), but there are three very important differences between
+app-defaults and X resources:</p>
<ol>
<li>A client's app-defaults are generally essential for its useful operation,
@@ -1188,8 +1188,8 @@
<h3><a id="changecoldepth">How do I change the color depth of my X
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>
+<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>
<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>
@@ -1372,13 +1372,13 @@
X Window System, use the <code class="command">gpm</code>-based approach,
described below.</p>
-<p>The <code class="command">gpm</code> approach is to feed X with the mouse data
-coming from <code class="command">gpm</code>, a cut-and-paste utility and mouse
-server for virtual consoles. The <code class="command">gpm</code> utility is of
-interest here because it can be configured to handle left-handed mouse devices.
-This approach has the drawback that all the users of the system have to share
-the same <code class="command">gpm</code> configuration, while with <code
-class="command">xmodmap</code> every user could have his or her own <code
+<p>The <code class="command">gpm</code> approach is to feed X with the mouse
+data coming from <code class="command">gpm</code>, a cut-and-paste utility and
+mouse server for virtual consoles. The <code class="command">gpm</code> utility
+is of interest here because it can be configured to handle left-handed mouse
+devices. This approach has the drawback that all the users of the system have
+to share the same <code class="command">gpm</code> configuration, while with
+<code class="command">xmodmap</code> every user could have his or her own <code
class="filespec">.Xmodmap</code> file.</p>
<p>To use the <code class="command">gpm</code> approach, you must modify two
@@ -1449,7 +1449,8 @@
file).</p>
</li>
- <li>I don't want <code class="command">xdm</code> to manage any remote servers.
+ <li>I don't want <code class="command">xdm</code> to manage any remote
+ servers.
<p>Edit <code class="filespec">/etc/X11/xdm/Xservers</code> appropriately.
Note that as this file ships, it does not manage any remote servers, so
unless you have already edited this file (or borrowed someone else's), no
@@ -1472,8 +1473,8 @@
well for people who have changed <code class="filespec">inittab</code> to start
a getty on VC 7.</p>
-<p>If you have increased your number of virtual consoles, or otherwise require VC
-7 for some purpose, simply edit <code
+<p>If you have increased your number of virtual consoles, or otherwise require
+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
@@ -1633,7 +1634,8 @@
<p>Move the mouse cursor into the white window, then press and release the "<
>" key. (There will be no visible response to your keystrokes.) Then kill
the X server, either by using <kbd>CTRL-ALT-BACKSPACE</kbd> or by switching back
-to the virtual console from which you ran xinit, and typing <kbd>CTRL-C</kbd>.</p>
+to the virtual console from which you ran xinit, and typing
+<kbd>CTRL-C</kbd>.</p>
<p>Next, use your favorite pager program to view <code
class="command">xev</code>'s output:<br />
@@ -2225,8 +2227,8 @@
<pre> gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*");</pre>
- <p>simply picks the first font in the alphabet that matches the wildcard. With
- the ISO10646-1 fonts present, this will be</p>
+ <p>simply picks the first font in the alphabet that matches the wildcard.
+ With the ISO10646-1 fonts present, this will be</p>
<pre> -Adobe-Helvetica-Medium-R-Normal--12-120-75-75-P-67-ISO10646-1</pre>
@@ -2276,10 +2278,10 @@
XFree86 Project, Inc.</a>:</p>
<blockquote>
- <p>The X Window System is a client-server window system. The memory for pixmap
- data resides on the server side instead of the client side. If you have 8
- 1600x1200 32bpp root window images that's 61 Megabytes. It resides in the
- server instead of the client, unless they are shared memory pixmaps, in
+ <p>The X Window System is a client-server window system. The memory for
+ pixmap data resides on the server side instead of the client side. If you
+ have 8 1600x1200 32bpp root window images that's 61 Megabytes. It resides in
+ the server instead of the client, unless they are shared memory pixmaps, in
which case it will be counted on both the server and client side.</p>
<p>Obviously this data has to be stored someplace. It's not like it can just
@@ -2471,8 +2473,8 @@
<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>(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
+ <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
itself.</li>
</ol>
@@ -2765,7 +2767,8 @@
<p>For <code class="filespec">/etc/X11/XF86Config-4</code>, do the following as
root:<br />
-<kbd>md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum<br />
+<kbd>md5sum /etc/X11/XF86Config-4 >
+/var/lib/xfree86/XF86Config-4.md5sum<br />
dpkg-reconfigure xserver-xfree86</kbd></p>
<p>(You may have <code class="package">xserver-xfree86-dbg</code> installed
@@ -2774,8 +2777,9 @@
<p>For <code class="filespec">/etc/X11/Xwrapper.config</code>, do the following
as root:<br />
-<kbd>md5sum /etc/X11/Xwrapper.config > /var/lib/xfree86/Xwrapper.config.md5sum<br />
-dpkg-reconfigure xserver-common</kbd></p>
+<kbd>md5sum /etc/X11/Xwrapper.config >
+/var/lib/xfree86/Xwrapper.config.md5sum<br /> dpkg-reconfigure
+xserver-common</kbd></p>
<p>Another way to accomplish the above is to purge the packages from your system
and reinstall them, but that can be considerably more disruptive.
@@ -2906,11 +2910,11 @@
<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>
-<p>No. If DRI (Direct Rendering Infrastructure) is disabled, then 3D-accelerated
-applications such as games may not run satisfactorily or at full speed, but
-this doesn't prevent the X server from working. A disabled DRI doesn't
-prevent your desktop from coming up, or programs like XTerm or Mozilla from
-running.</p>
+<p>No. If DRI (Direct Rendering Infrastructure) is disabled, then
+3D-accelerated applications such as games may not run satisfactorily or at full
+speed, but this doesn't prevent the X server from working. A disabled DRI
+doesn't prevent your desktop from coming up, or programs like XTerm or Mozilla
+from running.</p>
<p>If your X server is failing to start and you think this error message is the
problem, look elsewhere; the problem is something else.</p>
@@ -2998,10 +3002,11 @@
immediately. This can look a lot like a "crash" to the uninitiated, especially
when the clients themselves crash.</p>
-<p>It's easy to determine whether the X server itself works. As root, simply run
-the command <kbd>X</kbd>. If that brings up the little root window weave and the X
-cursor, then <em>you do not have a fatal X server configuration problem</em>.
-The X server is working. Use <kbd>CTRL-ALT-BACKSPACE</kbd> to kill it.</p>
+<p>It's easy to determine whether the X server itself works. As root, simply
+run the command <kbd>X</kbd>. If that brings up the little root window weave
+and the X cursor, then <em>you do not have a fatal X server configuration
+problem</em>. The X server is working. Use <kbd>CTRL-ALT-BACKSPACE</kbd> to
+kill it.</p>
<p>Alternatively, if you're using a display manager and you can see the greeter
(login screen), then the X server is running: <em>you do not have a fatal X
@@ -3067,8 +3072,8 @@
<p><em>Thanks to Denis Barbier for contributing much of this entry.</em></p>
-<p><em>Please see the glossary in <a href="#keyboard">"How does the keyboard work
-in the X Window System?"</a> above for explanantions of unfamiliar
+<p><em>Please see the glossary in <a href="#keyboard">"How does the keyboard
+work in the X Window System?"</a> above for explanantions of unfamiliar
terms.</em></p>
<p>The most significant recent change to keyboard configuration took place to
@@ -3077,7 +3082,7 @@
combining layouts. Prior to XFree86 4.3, though, this was difficult because
keyboard symbols (<em>keysyms</em>) were defined to be specific to a given
group. For example, the <code>us</code> symbols file (in <code
-class="filespec">/etc/X11/xkb/symbols/</code>) defined the its keycode to keysym
+class="filespec">/etc/X11/xkb/symbols/</code>) defined its keycode to keysym
mappings specifically for group 1 — the primary group. The
<code>us_group2</code> and <code>us_group3</code> files repeated these
definitions for group 2 and group 3, respectively. In addition to being
@@ -3425,15 +3430,24 @@
<ol>
<li>
- <p>Try to reproduce the problem by running the troublesome application from
- a shell prompt in a terminal window with the following environment variables
- set:</p>
- <pre>LIBGL_ALWAYS_INDIRECT=1; export LIBGL_ALWAYS_INDIRECT
-LIBGL_DEBUG=verbose; export LIBGL_DEBUG</pre>
- <p>Setting <code class="other">LIBGL_DEBUG=verbose</code> helps to ensure
- that indirect rendering is actually being used. Note that if it is, there
- will <em>not</em> be any special output, whereas if it's not (that is, if
- DRI is being used), you will see output like:</p>
+ <p>First, try to reproduce the problem by running the troublesome
+ application from a shell prompt in a terminal window with the following
+ environment variable set:</p>
+ <pre>LIBGL_DEBUG=verbose; export LIBGL_DEBUG</pre>
+ <p>If the problem is not reproducible, it is probably too soon to file a bug
+ report. Ask for assistance on the <a
+ href="http://lists.debian.org/debian-user/"><code
+ class="other">debian-user</code> mailing list</a>.</p>
+ </li>
+ <li>
+ <p>Next, to reproduce the problem as above with an additional environment
+ variable set:</p>
+ <pre>LIBGL_ALWAYS_INDIRECT=1; export LIBGL_ALWAYS_INDIRECT</pre>
+ <p>With <code class="other">LIBGL_DEBUG=verbose</code> already set and
+ exported, we can determine whether indirect rendering is actually being
+ used. Note that if it is, there will <em>not</em> be any special output,
+ whereas if it's not (that is, if DRI is being used), you will see output
+ like:</p>
<pre>libGL: XF86DRIGetClientDriverName: 4.0.1 r200 (screen 0)
libGL: OpenDriver:
trying /home/michdaen/src/mesa-cvs/Mesa/lib/r200_dri.so
@@ -3442,37 +3456,38 @@
drmOpenDevice: open result is 4, (OK)
drmOpenByBusid: drmOpenMinor returns 4
drmOpenByBusid: drmGetBusid reports pci:0000:00:10.0</pre>
- <p>If the problem is reproducible with indirect rendering, then there is
- likely a problem with the GL library itself. Use the command <kbd>dpkg -S
- /usr/lib/libGL.so.1</kbd> to determine which package provides your GL
- library, and file a bug report against it (or skip the middleman and use
- <kbd>reportbug --file /usr/lib/libGL.so.1</kbd>).</p>
+ <p>If the problem <em>is</em> reproducible with indirect rendering, then
+ there is likely a problem with the OpenGL/GLX implementation in the X server
+ — most likely, in the Mesa code shared between the X server and the
+ DRI 3D drivers.</p>
+ <p>The problem could also be in the underlying GL library on the
+ system, however; if you have reason to suspect this is the case, use the
+ command <kbd>dpkg -S /usr/lib/libGL.so.1</kbd> to determine which package
+ provides your GL library, and file a bug report against it (or skip the
+ middleman and use <kbd>reportbug --file /usr/lib/libGL.so.1</kbd>).</p>
<p>On the other hand, if the problem goes away when indirect rendering is
used, then one of the following is at fault:</p>
<ul>
- <li>the hardware-neutral parts of DRI</li>
+ <li>the X server's portions of DRI</li>
<li>the Mesa DRI module for your display adapter</li>
- <li>the Linux DRM module for your display adapter</li>
+ <li>the Linux DRM (Direct Rendering Manager) module for your display
+ adapter</li>
<li>your display adapter (i.e., a hardware bug that either Mesa or Linux
should try to work around, if possible)</li>
</ul>
</li>
<li>
- <p>To rule out problems with the hardware-neutral parts of DRI, remove the
- <code class="package">xlibmesa-dri</code> package if it is installed, and
- disable the <code class="other">Load "dri"</code> line in your <code
+ <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 the latter; you can run <kbd>dpkg-reconfigure xserver-xfree86</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 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 hardware-neutral part of DRI; file a bug
- against <code class="package">xserver-xfree86</code> and report your
- findings.</p>
- <p>You can of course reinstall the <code class="package">xlibmesa-dri</code>
- package if you removed it, and if you so desire.</p>
+ do this; you can run <kbd>dpkg-reconfigure xserver-xfree86</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
+ 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>
</li>
<li>
<p>Occassionally people find that problems with 3D acceleration appear and
Copied: branches/4.3.0/sid/debian/patches/099w_fix_XGetWProp_manpage.diff (from rev 2197, trunk/debian/patches/099w_fix_XGetWProp_manpage.diff)
Property changes on: branches/4.3.0/sid/debian/patches/099w_fix_XGetWProp_manpage.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/4.3.0/sid/debian/xdm.postrm.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.postrm.in 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/xdm.postrm.in 2005-02-18 19:41:26 UTC (rev 2198)
@@ -32,7 +32,14 @@
fi
if [ "$1" = "purge" ]; then
- update-rc.d xdm remove
+ # Sadly, we *have* to throw away update-rc.d's output because debhelper will
+ # call debconf for us, and update-rc.d's noise on debconf's standard input
+ # will confuse it.
+ #
+ # update-rc.d *should* run silently on success, but alas, it thinks it is an
+ # MS-DOS program. (update-rc.d supports neither -q [quiet] nor -v [verbose]
+ # options.)
+ update-rc.d xdm remove >/dev/null
for DIR in /etc/X11/xdm /var/lib/xdm; do
if [ -d "$DIR" ]; then
rm -r "$DIR"
Modified: branches/4.3.0/sid/debian/xfree86-common.postrm.in
===================================================================
--- branches/4.3.0/sid/debian/xfree86-common.postrm.in 2005-02-18 18:42:45 UTC (rev 2197)
+++ branches/4.3.0/sid/debian/xfree86-common.postrm.in 2005-02-18 19:41:26 UTC (rev 2198)
@@ -19,7 +19,14 @@
fi
if [ "$1" = "purge" ]; then
- update-rc.d xfree86-common remove
+ # Sadly, we *have* to throw away update-rc.d's output because debhelper will
+ # call debconf for us, and update-rc.d's noise on debconf's standard input
+ # will confuse it.
+ #
+ # update-rc.d *should* run silently on success, but alas, it thinks it is an
+ # MS-DOS program. (update-rc.d supports neither -q [quiet] nor -v [verbose]
+ # options.)
+ update-rc.d xfree86-common remove >/dev/null
for DIR in /etc/X11/Xresources /etc/X11/Xsession.d /etc/X11; do
rmdir "$DIR" 2> /dev/null || true
done
Reply to: