Author: branden
Date: 2004-04-21 14:01:41 -0500 (Wed, 21 Apr 2004)
New Revision: 1303
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Update annotations to indicate when code from XFree86 CVS was committed.
Identify one potential licensing problem.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-21 18:47:44 UTC (rev 1302)
+++ trunk/debian/changelog 2004-04-21 19:01:41 UTC (rev 1303)
@@ -74,17 +74,15 @@
packages' config scripts, invoke the discover command such that an
abnormal exit on its part does not crash the script.
- * Grab patches from upstream CVS HEAD (not under X-Oz or XFree86 1.1
- license) that fix loud chatter from Linux 2.6 such as:
- "atkbd.c: This is an XFree86 bug. It shouldn't access hardware directly.".
- + Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
- fallback that tries to directly program the keyboard repeat rate,
- and the related warning messages that recent Linux kernels generate
- (David Dawes).
- (Closes: #230204)
+ * Fix loud chatter from Linux 2.6 such as: "atkbd.c: This is an XFree86 bug.
+ It shouldn't access hardware directly." by performing KDKDBREP ioctl() on
+ the correct file descriptor, avoiding the fallback method for changing the
+ keyboard repeat rate that triggers this warning. Patch by David Dawes,
+ from XFree86 CVS 2004-03-04 (XXX: POTENTIAL LICENSING PROBLEM). (Closes:
+ #230204)
- * Grab fixes to the X server's DIX events processing from upstream CVS HEAD
- (not under X-Oz or XFree86 1.1 license).
+ * Grab fixes to the X server's DIX events processing from XFree86 CVS
+ (none later than 2004-01-23).
+ Fix a potential hang in Xinerama caused by an uninitialized
sprite.hotShape. [Mark Vojkovich]
+ Build fix for when XKB is disabled but XINPUT isn't. Reported by Paul
@@ -174,7 +172,8 @@
* Fix SEGV when attempting to use GLX extension on SPARC due to failure of
extension to initialize a Mesa context; patch by Ferris McCormick,
- backported from XFree86 CVS by Christian Guggenberger. (Closes: #241331)
+ backported from XFree86 CVS 2003-12-08 by Christian Guggenberger.
+ (Closes: #241331)
* Disable RandR extension support in siliconmotion driver when the driver's
"Rotate" option is used (thanks, Jim Paris). (Closes: #241286)
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 18:47:44 UTC
(rev 1302)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 19:01:41 UTC
(rev 1303)
@@ -82,6 +82,7 @@
fallback that tries to directly program the keyboard repeat rate,
and the related warning messages that recent Linux kernels generate
(David Dawes).
+XXX: POTENTIAL LICENSE PROBLEM IN THE ABOVE
xc/programs/Xserver/dix/events.c @ 3.48
Fix a potential hang in Xinerama caused by an uninitialized
