Bug#219311: xdm: Default install missing referenced config files
Branden Robinson writes: > > "Xsetup" and "Xreset" are referenced in the config file, but they no > > longer exist on disk. This causes "xdm" to bomb out on startup. > > I suspect your xdm daemon is in fact exiting for another reason. Are > there any error messages in /var/log/xdm.log? The log file was showing this: [[...blah blah blah...]] GetModeLine - scrn: 0 clock: 135000 GetModeLine - hdsp: 1280 hbeg: 1296 hend: 1440 httl: 1688 vdsp: 1024 vbeg: 1025 vend: 1028 vttl: 1066 flags: 5 SetGrabKeysState - enabled [[...I exit out of XDM to restart it after an update...]] Thu Nov 6 07:06:09 2003 xdm error (pid 14156): can't execute "/usr/X11R6/lib/X11/xdm/Xreset" (err 2) (EE) [GLX]: Failed to add GLX extension (NVIDIA XFree86 driver not found) Thu Nov 6 07:06:11 2003 xdm info (pid 510): starting X server on :0 Thu Nov 6 07:06:11 2003 xdm error (pid 14163): can't execute "/usr/X11R6/lib/X11/xdm/Xsetup" (err 2) Thu Nov 6 07:06:15 2003 xdm error (pid 14232): can't execute "/usr/X11R6/lib/X11/xdm/Xreset" (err 2) (EE) [GLX]: Failed to add GLX extension (NVIDIA XFree86 driver not found) Thu Nov 6 07:06:17 2003 xdm info (pid 510): starting X server on :0 Thu Nov 6 07:06:17 2003 xdm error (pid 14239): can't execute "/usr/X11R6/lib/X11/xdm/Xsetup" (err 2) Thu Nov 6 07:06:21 2003 xdm error (pid 14308): can't execute "/usr/X11R6/lib/X11/xdm/Xreset" (err 2) So it exited, started up, exited shortly thereafter, started up again, exited shortly thereafter, etc. Something was screwed up. >From your comments, it looks like XDM was handling the missing Xsetup and Xreset files correctly. The message just needs to be downgraded from "xdm error" to "xdm warning". The more interesting issue is that the normal X server messages are missing. That's why I focused on the XDM errors in the first place. I expect those missing messages are related to the X failure, but I can't say for sure because (all together now!) I can't reproduce it. Running X through XDM is working fine now. So yeah, either close it, or mark it as a "wishlist" item to change "error" to "warning". Thanks, Derek -- Derek Upham [EMAIL PROTECTED] "Ha! Your Leaping Tiger Kung Fu is no match for my Frightened Piglet style!"
Re: X Strike Force XFree86 SVN commit: rev 765 - trunk/debian/patches
On Wed, Nov 12, 2003 at 11:47:48PM -0500, X Strike Force SVN Repository Admin wrote: > Properly backport fix from XFree86 CVS HEAD for Linux kernel 2.6 header > rate/period problem; initial patch was incomplete. Does this issue apply to the 4.3 branch, as well? -- Daniel Stone<[EMAIL PROTECTED]> Debian X Strike Force:http://people.debian.org/~branden/xsf/ pgpV12rW3Eqxf.pgp Description: PGP signature
X Strike Force XFree86 SVN commit: rev 765 - trunk/debian/patches
Author: branden
Date: 2003-11-12 23:47:39 -0500 (Wed, 12 Nov 2003)
New Revision: 765
Modified:
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Properly backport fix from XFree86 CVS HEAD for Linux kernel 2.6 header
rate/period problem; initial patch was incomplete.
- debian/patches/000_stolen_from_HEAD.diff
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 20:58:28 UTC
(rev 764)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-13 04:47:39 UTC
(rev 765)
@@ -5454,10 +5454,9 @@
}
#endif
if (setuid(verify->uid) < 0)
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
2003-11-12 18:00:24.0 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12
18:01:33.0 +1100
-@@ -67,6 +67,7 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2003-11-12
23:19:43.0 -0500
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12
23:23:38.0 -0500
+@@ -67,11 +67,19 @@
* from util-linux-2.9t package */
#include
@@ -5465,3 +5464,23 @@
#ifdef __sparc__
#include
#include
+ #endif
+
++/* Deal with gratuitous kernel header change */
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++# define rate period
++# endif
++#endif
++
+ static int
+ KDKBDREP_ioctl_ok(int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+@@ -133,6 +141,7 @@
+ #endif /* KIOCSRATE */
+ }
+
++#undef rate
+
+ #if NeedFunctionPrototypes
+ void xf86SetKbdRepeat(char rad)
Bug#220511: X -configure crash
Package: xserver-xfree86 I ran X -configure and got a crash. The XFree86.log.0 is attached. I was asked to run scanpci -v. The output of that is also attached. regards, //Martin Kihlgren, [EMAIL PROTECTED] -- ### If graphics hackers are so smart, why can't they get the bugs out of fresh paint? ### This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported to XFree86@XFree86.Org and patches submitted to [EMAIL PROTECTED] Before reporting bugs in pre-release versions, please check the latest version in the XFree86 CVS repository (http://www.XFree86.Org/cvs) XFree86 Version 4.2.1.1 (Debian 4.2.1-12.1 20031003005825 [EMAIL PROTECTED]) / X Window System (protocol Version 11, revision 0, vendor release 6600) Release Date: 18 October 2002 If the server is older than 6-12 months, or if your card is newer than the above date, look for a newer version before reporting problems. (See http://www.XFree86.Org/) Build Operating System: Linux 2.4.21-rc1-ac1-cryptoloop i686 [ELF] Module Loader present Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: "/var/log/XFree86.0.log", Time: Thu Nov 13 10:17:46 2003 (--) using VT number 7 (WW) Open APM failed (/dev/apm_bios) (No such file or directory) (II) Module ABI versions: XFree86 ANSI C Emulation: 0.1 XFree86 Video Driver: 0.5 XFree86 XInput driver : 0.3 XFree86 Server Extension : 0.1 XFree86 Font Renderer : 0.3 (II) Loader running on linux (II) LoadModule: "bitmap" (II) Loading /usr/X11R6/lib/modules/fonts/libbitmap.a (II) Module bitmap: vendor="The XFree86 Project" compiled for 4.2.1.1, module version = 1.0.0 Module class: XFree86 Font Renderer ABI class: XFree86 Font Renderer, version 0.3 (II) Loading font Bitmap (II) LoadModule: "pcidata" (II) Loading /usr/X11R6/lib/modules/libpcidata.a (II) Module pcidata: vendor="The XFree86 Project" compiled for 4.2.1.1, module version = 0.1.0 ABI class: XFree86 Video Driver, version 0.5 (II) PCI: Probing config type using method 1 (II) PCI: Config type is 1 (II) PCI: stages = 0x03, oldVal1 = 0x, mode1Res1 = 0x8000 (II) PCI: PCI scan (all values are in hex) (II) PCI: 00:00:0: chip 8086,3340 card 1179,0001 rev 03 class 06,00,00 hdr 00 (II) PCI: 00:01:0: chip 8086,3341 card , rev 03 class 06,04,00 hdr 01 (II) PCI: 00:1d:0: chip 8086,24c2 card 1179,0001 rev 03 class 0c,03,00 hdr 80 (II) PCI: 00:1d:1: chip 8086,24c4 card 1179,0001 rev 03 class 0c,03,00 hdr 00 (II) PCI: 00:1d:7: chip 8086,24cd card 1179,0001 rev 03 class 0c,03,20 hdr 00 (II) PCI: 00:1e:0: chip 8086,2448 card , rev 83 class 06,04,00 hdr 01 (II) PCI: 00:1f:0: chip 8086,24cc card , rev 03 class 06,01,00 hdr 80 (II) PCI: 00:1f:1: chip 8086,24ca card 1179,0001 rev 03 class 01,01,8a hdr 00 (II) PCI: 00:1f:5: chip 8086,24c5 card 1179,0205 rev 03 class 04,01,00 hdr 00 (II) PCI: 00:1f:6: chip 8086,24c6 card 1179,0001 rev 03 class 07,03,00 hdr 00 (II) PCI: 01:00:0: chip 1023,2100 card 1179,0002 rev 91 class 03,00,00 hdr 00 (II) PCI: 02:08:0: chip 8086,103d card 1179,0001 rev 83 class 02,00,00 hdr 00 (II) PCI: 02:0a:0: chip 8086,1043 card 8086,2581 rev 04 class 02,80,00 hdr 00 (II) PCI: 02:0b:0: chip 1179,0617 card , rev 33 class 06,07,00 hdr 02 (II) PCI: 02:0d:0: chip 1179,0805 card 1179,0001 rev 05 class 08,80,00 hdr 00 (II) PCI: End of PCI scan (II) LoadModule: "scanpci" (II) Loading /usr/X11R6/lib/modules/libscanpci.a (II) Module scanpci: vendor="The XFree86 Project" compiled for 4.2.1.1, module version = 0.1.0 ABI class: XFree86 Video Driver, version 0.5 (II) UnloadModule: "scanpci" (II) Unloading /usr/X11R6/lib/modules/libscanpci.a (II) Host-to-PCI bridge: (II) PCI-to-ISA bridge: (II) PCI-to-PCI bridge: (II) PCI-to-PCI bridge: (II) Bus 0: bridge is at (0:0:0), (-1,0,0), BCTRL: 0x08 (VGA_EN is set) (II) Bus 0 I/O range: [0] -1 00x - 0x (0x1) IX[B] (II) Bus 0 non-prefetchable memory range: [0] -1 00x - 0x (0x0) MX[B] (II) Bus 0 prefetchable memory range: [0] -1 00x - 0x (0x0) MX[B] (II) Bus 1: bridge is at (0:1:0), (0,1,1), BCTRL: 0x08 (VGA_EN is set) (II) Bus 1 I/O range: (II) Bus 1 non-prefetchable memory range: [0] -1 00xdff0 - 0xf7ff (0x1810) MX[B] (II) Bus 1 prefetchable memory range: (II) Bus 2: bridge is at (0:30:0), (0,2,4), BCTRL: 0x00 (VGA_EN is cleared) (II) Bus 2 I/O range: [0] -1 00xc000 - 0xcfff (0x1000) IX[B] (II) Bus 2 non-prefetchable memory range: [0] -1 00xdfd0 - 0xdfdf (0x10) MX[B]
Bug#220493: Want a more recent version of the XFree86-server
Package: xserver-xfree86 Version: 4.2.1-12.1 Severity: wishlist Hi, in general I'm a friend of the somewhat conservative strategie of the Debian project, but ... The XFree86 project is going to release version 4.4 of it's server in about a month. The Debian testing and unstable tree still contains only version 4.2.1 of this server which has been made obsolete by the release of the follow-up version (4.3) more than 8 months ago! Even this old Debian 4.2.1-version declares itself as a pre-release version, but this is another topic: This is a pre-release version of XFree86, and is not supported in any way ... I don't know the reason but IMHO ignoring a new stable release of a that much hardware related program for more than 8 months is a bit too much. Version 4.3 should have been gone into testing long ago. Even in the experimental tree I could only find a pre-4.3-version of the xserver-xfree86 package. Or is this in reality a pre-4.4-version, which would be a glimmer of hope for the future? Uwe -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux p3 2.4.22 #1 Sun Aug 31 00:21:40 CEST 2003 i686 Versions of packages xserver-xfree86 depends on: ii debconf 1.3.15 Debian configuration management sy ii libc6 2.3.2-9GNU C Library: Shared libraries an ii xserver-common4.2.1-12.1 files and utilities common to all ii zlib1g1:1.1.4-16 compression library - runtime
Bug#220469: xserver-xfree86: dpkg-reconfigure should create the config file if it doesn't exist
Package: xserver-xfree86 Version: 4.2.1-12.1 Severity: minor Hi, I like the idea protecting changes in the XF86Config-4 config file by a md5-sum. But if the config file doesn't exist dpkg-reconfigure should create a new one instead of refusing to write it: # dpkg-reconfigure xserver-xfree86 Note: not updating /etc/X11/XF86Config-4; file does not exist. If you are playing around with different options or even different graphic cards and want to start from scratch with a new config file you have to remove and reinstall the xserver-package (or at least with knowledge of package internals to recreate the md5-file). Removing the config file would be the much easier way. Uwe BTW: Getting the warning about a changed config file BEFORE going through all the config questions would be nice. But maybe the config mechanism doesn't have the ability to distinguish between the package installation and a run of dpkg-reconfigure? -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux coruba 2.4.21 #1 Sun Jun 15 03:15:21 CEST 2003 i686 Versions of packages xserver-xfree86 depends on: ii debconf 1.3.15 Debian configuration management sy ii libc6 2.3.2-9GNU C Library: Shared libraries an ii xserver-common4.2.1-12.1 files and utilities common to all ii zlib1g1:1.1.4-16 compression library - runtime
X Strike Force XFree86 SVN commit: rev 764 - branches/4.3.0/sid/debian
Author: branden Date: 2003-11-12 15:58:28 -0500 (Wed, 12 Nov 2003) New Revision: 764 Modified: branches/4.3.0/sid/debian/TODO Log: Updated and fleshed out TODO items for 4.3.0-1. - debian/TODO Modified: branches/4.3.0/sid/debian/TODO === --- branches/4.3.0/sid/debian/TODO 2003-11-12 19:51:32 UTC (rev 763) +++ branches/4.3.0/sid/debian/TODO 2003-11-12 20:58:28 UTC (rev 764) @@ -4,13 +4,34 @@ -1 -- +* merge 4.2.1-14 (once it is tagged): + + omit change to 000_stolen_from_HEAD.diff + * split xlibs* and xbase-clients (one package per shared library; xbase-clients should be broken into functional groups probably mostly determined by library dependencies; xauth, the Athena clients, and libGL-linked clients are all good candidates for splitting) + + To view progress on the above work, see: + http://necrotic.deadbeast.net/cgi-bin/viewcvs.cgi/people/branden/xlibs-and-xbase-clients-split/ + * ensure packages are at least as functional on the architectures in testing as the 4.2.1 packages are (so that no arch sees a horrendous regression) + + Never uploaded xfree86 4.3.0-0pre* to experimental + -- + mipsel + s390 + + Need to upload xfree86 4.3.0-0pre1v4 to experimental + + alpha + hppa + m68k + mips + sparc + * clean up the debian/patches disaster: Patch forward-port status chart:
Processed: Re: Bug#217505: xdm creates x-n file in /home
Processing commands for [EMAIL PROTECTED]: > retitle 217505 xdm: creates $HOME/x-n file Bug#217505: xdm creates x-n file in /home Changed Bug title. > tag 217505 + moreinfo Bug#217505: xdm: creates $HOME/x-n file There were no tags set. Tags added: moreinfo > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: tagging 200256
Processing commands for [EMAIL PROTECTED]: > # fixed in Debian X Strike Force XFree86 repository, revision 763; see > http://deadbeast.net/cgi-bin/viewcvs.cgi/?root=xfree86 > tag 200256 + pending Bug#200256: xlibs-data: [nls] X doesn't recognize 'ko_KR.EUC-KR' locale Tags were: upstream patch experimental help Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#217505: xdm creates x-n file in /home
retitle 217505 xdm: creates $HOME/x-n file
tag 217505 + moreinfo
thanks
On Sat, Oct 25, 2003 at 12:02:14PM +0200, Fekete Gabor wrote:
> Package: xdm
> Version: 4.2.1-12.1
>
> XDM creates a file named x-n in /home. I don't
> know if it's a bug but I did not find any doc
> that mentioned it. And it's really annoying.
> The x in the name might be the user name.
>
> I'm running Debian Sid.
Can you please stop your running xdm daemon ("invoke-rc.d xdm stop") and
mail this bug the output of the following command?:
# xdm -nodaemon -debug 1 > /tmp/xdm.debug 2>&1
(Use whatever filename you like instead of /tmp/xdm.debug.)
Also, do you mean that, given a user named "foobar":
1) a file named /home/foobar-n is created
2) a file named /home/foobar/x-n is created
3) a file named /home/foobar/foobar-n is created
?
Or something else entirely?
--
G. Branden Robinson| The power of accurate observation
Debian GNU/Linux | is frequently called cynicism by
[EMAIL PROTECTED] | those who don't have it.
http://people.debian.org/~branden/ | -- George Bernard Shaw
signature.asc
Description: Digital signature
Bug#219311: xdm: Default install missing referenced config files
severity 219311 normal retitle 219311 xdm: mysteriously fails to start tag 219311 + unreproducible moreinfo thanks On Thu, Nov 06, 2003 at 03:29:13PM -, [EMAIL PROTECTED] wrote: > Package: xdm > Version: 4.2.1-13 > Severity: grave I cannot reproduce this problem with 4.2.1-13, so I am downgrading its severity and tagging it "unreproducible". > The "Confiles" section of the package description lists various files > in /etc/X11/xdm (and "/usr/X11R6/lib/X11/xdm" links to this directory): > > /etc/X11/xdm/Xaccess df56c4c3eb66cbc9470c07da301acd7b > /etc/X11/xdm/Xresources 06d02faa0199503f98c9ebd9b7a81517 > /etc/X11/xdm/Xservers 6689c34e7b3f2e1f7af17a3350c1490c > /etc/X11/xdm/Xsession 7665beb7c953f2ad9df08f7f73b64fb7 > /etc/X11/xdm/Xstartup 8e6bb9af52a4f6dced7b7a890aa34851 > /etc/X11/xdm/Xwilling 5aec82ecf912e050a02f84d8d572 Mine says: Package: xdm [...] Conffiles: /etc/X11/app-defaults/Chooser 301817610e89e7739ce1e121b3baf20c /etc/X11/xdm/Xaccess 2bbf5b9f056c65a1754b75ba452e1ea1 /etc/X11/xdm/Xresources 0e0183a34449ba8acc07d80b0a5b1828 /etc/X11/xdm/Xservers 6689c34e7b3f2e1f7af17a3350c1490c /etc/X11/xdm/Xsession 7665beb7c953f2ad9df08f7f73b64fb7 /etc/X11/xdm/Xstartup deaea0d02e5107fca3c4787532b891bb /etc/X11/xdm/Xwilling 5aec82ecf912e050a02f84d8d572 /etc/X11/xdm/pixmaps/XFree86.xpm 91cf8f46b31119b5d69270ae7bc5081d /etc/X11/xdm/pixmaps/XFree86bw.xpm c9ef591e6e78edd3d2352e55c0067160 /etc/X11/xdm/pixmaps/debian.xpm 8bd89d6976e41f6598ab61fda364505e /etc/X11/xdm/pixmaps/debianbw.xpm c90b32c82b91d0c8c69ba5a69594a21f /etc/X11/xdm/xdm-config a542e61c838ee622b8aca1036e1f6233 /etc/X11/xdm/xdm.options 7be084d51db91e48365a70e13daecee8 /etc/pam.d/xdm cd7c8cbb6b3720f4d16054f40f4ebc47 /etc/init.d/xdm e914796982b135c77cfae75c951380e3 /etc/logrotate.d/xdm 4c38b36684387eb57228ca71c1383e5c Description: X display manager [...] > The "xdm-config" file references the following scripts: > > DisplayManager*startup: /usr/X11R6/lib/X11/xdm/Xstartup > DisplayManager*resources: /usr/X11R6/lib/X11/xdm/Xresources > DisplayManager*session: /usr/X11R6/lib/X11/xdm/Xsession > DisplayManager*setup: /usr/X11R6/lib/X11/xdm/Xsetup > DisplayManager*reset: /usr/X11R6/lib/X11/xdm/Xreset Mine says: ! $Xorg: xdm-conf.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ [...] ! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.10 2002/11/30 19:11:32 herrb Exp $ [...] ! Scripts to start the server, start the user session, and reset the server DisplayManager*setup: /usr/X11R6/lib/X11/xdm/Xsetup DisplayManager*startup: /usr/X11R6/lib/X11/xdm/Xstartup DisplayManager*reset: /usr/X11R6/lib/X11/xdm/Xreset DisplayManager*resources: /usr/X11R6/lib/X11/xdm/Xresources DisplayManager*session: /usr/X11R6/lib/X11/xdm/Xsession [...] ...and this does not appear to adversely affect its operation. > "Xsetup" and "Xreset" are referenced in the config file, but they no > longer exist on disk. This causes "xdm" to bomb out on startup. I suspect your xdm daemon is in fact exiting for another reason. Are there any error messages in /var/log/xdm.log? -- G. Branden Robinson|There is no housing shortage in Debian GNU/Linux |Lincoln today -- just a rumor that [EMAIL PROTECTED] |is put about by people who have http://people.debian.org/~branden/ |nowhere to live.-- G. L. Murfin signature.asc Description: Digital signature
Processed: Re: Bug#219311: xdm: Default install missing referenced config files
Processing commands for [EMAIL PROTECTED]: > severity 219311 normal Bug#219311: xdm: Default install missing referenced config files Severity set to `normal'. > retitle 219311 xdm: mysteriously fails to start Bug#219311: xdm: Default install missing referenced config files Changed Bug title. > tag 219311 + unreproducible moreinfo Bug#219311: xdm: mysteriously fails to start There were no tags set. Tags added: unreproducible, moreinfo > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: rev 763 - in trunk/debian: . patches
Author: branden
Date: 2003-11-12 14:51:32 -0500 (Wed, 12 Nov 2003)
New Revision: 763
Added:
trunk/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
Modified:
trunk/debian/changelog
Log:
Recognize the ko_KR.EUC-KR locale (thanks, Denis Barbier).
(Closes: #200256)
- debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2003-11-12 16:57:28 UTC (rev 762)
+++ trunk/debian/changelog 2003-11-12 19:51:32 UTC (rev 763)
@@ -29,8 +29,12 @@
(Closes: #219714)
- debian/patches/000_stolen_from_HEAD.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 12 Nov 2003 11:41:58 -0500
+ * Recognize the ko_KR.EUC-KR locale (thanks, Denis Barbier).
+(Closes: #200256)
+- debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 12 Nov 2003 12:29:52 -0500
+
xfree86 (4.2.1-13) unstable; urgency=low
* Acknowledge bug fixed in NMU. Thanks, LaMont! (Closes: #213774)
@@ -2408,9 +2412,9 @@
instead of 2
* debian/xserver-xfree86.docs.*: remove README.DRI{,comp}
* debian/xserver-xfree86.templates:
-- clarify the circumstances under which advanced users can look for the
+- clarify the circumstances under which advanced users can look for the
XKB directory (Closes: #140228)
-- clarify that the mouse questions don't support more than 5 buttons
+- clarify that the mouse questions don't support more than 5 buttons
(see #141390)
-- Branden Robinson <[EMAIL PROTECTED]> Tue, 3 Sep 2002 01:04:23 -0500
Added: trunk/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
===
--- trunk/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
2003-11-12 16:57:28 UTC (rev 762)
+++ trunk/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
2003-11-12 19:51:32 UTC (rev 763)
@@ -0,0 +1,16 @@
+$Id$
+
+This patch by Denis Barbier <[EMAIL PROTECTED]>.
+
+Not submitted upstream yet.
+
+--- xc/nls/locale.alias~ 2003-11-12 12:03:00.0 -0500
xc/nls/locale.alias2003-11-12 12:27:30.0 -0500
+@@ -389,6 +389,7 @@
+ ko_KR.EUC:ko_KR.eucKR
+ ko_KR.euc:ko_KR.eucKR
+ ko_KR.euckr: ko_KR.eucKR
++ko_KR.EUC-KR: ko_KR.eucKR
+ ko_KR.utf8: ko_KR.UTF-8
+ kw: kw_GB.ISO8859-1
+ kw_GB:kw_GB.ISO8859-1
Property changes on:
trunk/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
___
Name: svn:keywords
+ Id
Bug#220448: xserver-xfree86: Some fonts simply don't show up, adobe courier for example
Package: xserver-xfree86 Version: 4.3.0-0pre1v3 Severity: normal [First of all I had the same problem with the version of X in unstable. This was one of the reasons I tried the experimental version] I have a problem that some fonts simply don't show up, instead I get blank lines. But I can't figure out exactly what the pattern is. When I play with xfontsel I cannot reproduce the problem. But the problem isn't just a particular application, both Konqueror and Mozilla have precisely the same behaviour, for example. I think the problem affects only the Adobe fonts, but some adobe fonts do show up just fine (Symbol, Bookman, Century) while others show up as blank lines (Courier) and others don't even show up in my font menus (whatever happened to Times, Avant Garde, Zapf Dingbats?) The most common problem occurs with Courier, especially since it's the deafult fixed width font for a lot of applications. It's driving me nuts on the php.net web site for example where the style sheet uses it for a lot of things. The weird thing is that courier and several other fonts show up in the konqueror font menu (which uses the font itself for each choice) as blank. Some of the blank fonts work fine, others seem to display as blanks like Courier. Not all of them are adobe fonts. Reading the other bug reports I thought it might be the same as the :unscaled bug but I replaced the Files section of my Config with the set specified in that bug report and the problem persists unchanged. The config I was using previously is commented out. One thing that frightens me though -- the mouse pointer is still big, like the big-cursor font in the commented out section. I don't understand how that would be. I C-A-BS'd the server to make sure it reread the config file. And I'm pretty sure I'm editing the right config file. -- Package-specific info: 01:00.0 VGA compatible controller: Matrox Graphics, Inc. MGA G400 AGP (rev 04) 02:0c.0 VGA compatible controller: ATI Technologies Inc 3D Rage I/II 215GT [Mach64 GT] (rev 41) 01:00.0 Class 0300: 102b:0525 (rev 04) 02:0c.0 Class 0300: 1002:4754 (rev 41) # XF86Config-4 (XFree86 server configuration file) generated by Dexter, the # Debian X Configuration tool. # # Edit this file with caution, and see the XF86Config manual page. # (Type "man XF86Config" at the shell prompt.) Section "Files" FontPath"unix/:7100"# local font server # if the local font server has problems, we can fall back on these FontPath"/usr/lib/X11/fonts/misc" FontPath"/usr/lib/X11/fonts/cyrillic" FontPath"/usr/lib/X11/fonts/100dpi/:unscaled" FontPath"/usr/lib/X11/fonts/75dpi/:unscaled" FontPath"/usr/lib/X11/fonts/Type1" FontPath"/usr/lib/X11/fonts/Speedo" FontPath"/usr/lib/X11/fonts/100dpi" FontPath"/usr/lib/X11/fonts/75dpi" EndSection #Section "Files" # FontPath"unix/:7101"# local font server # # if the local font server has problems, we can fall back on these ##FontPath"/usr/X11R6/lib/X11/fonts/big-cursor" # FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID" # FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" # FontPath"/usr/lib/X11/fonts/misc" # FontPath"/usr/lib/X11/fonts/cyrillic" # FontPath"/usr/lib/X11/fonts/100dpi/:unscaled" # FontPath"/usr/lib/X11/fonts/75dpi/:unscaled" # FontPath"/usr/lib/X11/fonts/Type1" # FontPath"/usr/lib/X11/fonts/Speedo" # FontPath"/usr/lib/X11/fonts/100dpi" # FontPath"/usr/lib/X11/fonts/75dpi" #FontPath"/usr/X11R6/lib/X11/fonts/sharefont/" #EndSection Section "ServerFlags" EndSection Section "Module" Load"ddc" Load"GLcore" Load"dbe" # Load"dri" Load"extmod" Load"glx" # Load"pex5" Load"record" # Load"xie" Load"bitmap" Load"freetype" Load"speedo" Load"type1" Load"vbe" Load"int10" EndSection Section "InputDevice" Identifier "Generic Keyboard" Driver "keyboard" Option "CoreKeyboard" # Option "XkbRules" "xfree86" # Option "XkbModel" "pc104" # Option "XkbLayout" "us" EndSection Section "InputDevice" Identifier "Generic Mouse" Driver "mouse" Option "CorePointer" Option "Protocol" "MouseManPlusPS/2" Option "Device""/dev/psaux" Option "Emulate3Buttons" "false" Option "Buttons" "5" Option "ZAxisMapping" "4 5" EndSection Section "Device" Identifier
i830 problems on XFree 4.3
Hi! I have a few problems running 4.3.0-0pre1v4 on my notebook. I have i830MG chipset with integrated video. My configuration is as follows: kernel: version: 2.6.0-test7 DRM compiled into kernel (CONFIG_DRM=y) '/proc/dri/0/name' says it's "i830 0xe200" XF86Config-4: "i810" video driver Module "dri" is loaded Section "DRI" present with correct permissions "xlibmesa-dri" package is installed But when I run any OpenGL app (glxinfo, glxgears, quakeforge) I get the following message: Xlib: extension "XFree86-DRI" missing on display ":0.0". and no acceleration :^( What have I done wrong? -- Alexander Barinov Project Manager Banking Technologies Center, Diasoft [EMAIL PROTECTED] http://www.diasoft.ru
Processed: tagging 219714
Processing commands for [EMAIL PROTECTED]: > # fixed in Debian X Strike Force XFree86 repository, revision 761; see > http://deadbeast.net/cgi-bin/viewcvs.cgi/?root=xfree86 > tag 219714 + pending Bug#219714: xfree86: FTBFS on i386: lnx_io.c: structure has no member named `rate' Tags were: sid Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: rev 762 - branches/4.3.0/sid/debian
Author: branden
Date: 2003-11-12 11:57:28 -0500 (Wed, 12 Nov 2003)
New Revision: 762
Modified:
branches/4.3.0/sid/debian/control
Log:
Fix another trunk merge casualty; x-window-system-dev should depend on
xlibs-static-pic, not xlibs-pic.
- debian/control
Modified: branches/4.3.0/sid/debian/control
===
--- branches/4.3.0/sid/debian/control 2003-11-12 16:55:19 UTC (rev 761)
+++ branches/4.3.0/sid/debian/control 2003-11-12 16:57:28 UTC (rev 762)
@@ -1170,7 +1170,7 @@
Package: x-window-system-dev
Architecture: any
-Depends: libdps1-dbg, libdps-dev, libxaw7-dbg, libxaw7-dev, xlibmesa3-gl-dbg,
xlibmesa-gl-dev, xlibmesa3-glu-dbg, xlibmesa-glu-dev,
${F:XWSD-Special-Depends}xlibs-dbg, xlibs-dev, xlibs-pic, xspecs
+Depends: libdps1-dbg, libdps-dev, libxaw7-dbg, libxaw7-dev, xlibmesa3-gl-dbg,
xlibmesa-gl-dev, xlibmesa3-glu-dbg, xlibmesa-glu-dev,
${F:XWSD-Special-Depends}xlibs-dbg, xlibs-dev, xlibs-static-pic, xspecs
Description: X Window System development components
This metapackage provides the components of the X Window System as developed
by the XFree86 Project which are most interesting to programmers.
X Strike Force XFree86 SVN commit: rev 761 - in trunk/debian: . patches
Author: branden
Date: 2003-11-12 11:55:19 -0500 (Wed, 12 Nov 2003)
New Revision: 761
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Fix building against 2.6.x kernel headers by adding '#define rate period'
where needed; fixes FTBFS when linux-kernel-headers package installed.
(Closes: #219714)
- debian/patches/000_stolen_from_HEAD.diff
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2003-11-12 16:36:11 UTC (rev 760)
+++ trunk/debian/changelog 2003-11-12 16:55:19 UTC (rev 761)
@@ -1,5 +1,7 @@
-xfree86 (4.2.1-14) unstable; urgency=low
+xfree86 (4.2.1-14) unstable; urgency=medium
+ * Urgency due to fix for FTBFS triggered by linux-kernel-headers package.
+
* Make libxaw6-dev and libxaw7-dev conflict with and replace libxaw-dev (<<
4.0.3); the latter existed as a real package in pre-woody unstable, and
this permits smooth upgrades from such systems.
@@ -22,8 +24,13 @@
- debian/scripts/vars.powerpc
- debian/scripts/vars.sparc
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 3 Nov 2003 00:43:29 -0500
+ * Fix building against 2.6.x kernel headers by adding '#define rate period'
+where needed; fixes FTBFS when linux-kernel-headers package installed.
+(Closes: #219714)
+- debian/patches/000_stolen_from_HEAD.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 12 Nov 2003 11:41:58 -0500
+
xfree86 (4.2.1-13) unstable; urgency=low
* Acknowledge bug fixed in NMU. Thanks, LaMont! (Closes: #213774)
@@ -2403,7 +2410,7 @@
* debian/xserver-xfree86.templates:
- clarify the circumstances under which advanced users can look for the
XKB directory (Closes: #140228)
-- clarify that the mouse questions don't support more than 5 buttons
+- clarify that the mouse questions don't support more than 5 buttons
(see #141390)
-- Branden Robinson <[EMAIL PROTECTED]> Tue, 3 Sep 2002 01:04:23 -0500
@@ -2413,7 +2420,7 @@
* patch #000_post_xf-4_2_0:
- include DPMS fix for r128 driver (thanks to Stuart Anderson for pulling
the patch over to xf-4_2-branch)
- * patch #000_stolen_from_HEAD:
+ * patch #000_stolen_from_HEAD:
- Fix SEGV in 3dfx DRI driver. (Alan Hourihane)
- Fix enabling of i810 DRI when XvMC is disabled (#5208, Matthew Sottek,
Intel).
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 16:36:11 UTC
(rev 760)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 16:55:19 UTC
(rev 761)
@@ -271,6 +271,10 @@
Handle errors from pam_setcred(), reporting them with pam_strerror().
(Matthieu Herrb, Branden Robinson)
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c):
+ Build fix when using Linux kernel 2.6 headers. (Marc La France, via
+ Michel D�nzer)
+
Index: xc/nls/XI18N_OBJS/Imakefile
===
RCS file: /cvs/xc/nls/XI18N_OBJS/Imakefile,v
@@ -3749,12 +3753,12 @@
-dirmode |= (devmode & S_IROTH) ? S_IXOTH : 0;
-dirmode |= devmode;
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
- group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
+ group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
#endif
if (stat(DRM_DIR_NAME, &st)) {
if (!isroot) return DRM_ERR_NOT_ROOT;
-- remove(DRM_DIR_NAME);
+- remove(DRM_DIR_NAME);
- mkdir(DRM_DIR_NAME, dirmode);
+ mkdir(DRM_DIR_NAME, DRM_DEV_DIRMODE);
+ chown(DRM_DIR_NAME, 0, 0); /* root:root */
@@ -5450,3 +5454,14 @@
}
#endif
if (setuid(verify->uid) < 0)
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
2003-11-12 18:00:24.0 +1100
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12
18:01:33.0 +1100
+@@ -67,6 +67,7 @@
+ * from util-linux-2.9t package */
+
+ #include
++#include
+ #ifdef __sparc__
+ #include
+ #include
X Strike Force XFree86 SVN commit: rev 760 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-11-12 11:36:11 -0500 (Wed, 12 Nov 2003)
New Revision: 760
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
(cosmetic) Tweak changelog message for kernel-2.6-headers build problem.
(cosmetic) Add explanation of changes to lnx_{io,kbd}.c to header of
000_stolen_from_HEAD.diff.
- debian/changelog
- debian/patches/000_stolen_from_HEAD.diff
Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-11-12 08:52:12 UTC (rev 759)
+++ branches/4.3.0/sid/debian/changelog 2003-11-12 16:36:11 UTC (rev 760)
@@ -86,11 +86,11 @@
- debian/control
[DROP THIS ENTRY WHEN 4.2.1-14 MERGED.]
- * Fix building on 2.6.x kernels by adding '#define rate period' where needed
-(thanks, Fabio di Nitto).
+ * Fix building against 2.6.x kernel headers by adding '#define rate period'
+where needed. [Fabio Massimo Di Nitto, Daniel Stone]
- debian/patches/000_stolen_from_HEAD.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 12 Nov 2003 02:27:58 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 12 Nov 2003 11:32:37 -0500
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
@@ -2448,7 +2448,7 @@
(Closes: #85365)
+ Sync with Type1 font rasterizer from HEAD:
- Some minor include cleanups. (David Dawes)
- - Avoid redefining abort(), a well known C library function. This can
+ - Avoid redefining abort(), a well known C library function. This can
cause errors when the abort() prototype from stdlib.h is included
later by Xos.h. (Matthieu Herrb)
- A "hammer" approach at ensuring font properties are freed properly.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12
08:52:12 UTC (rev 759)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12
16:36:11 UTC (rev 760)
@@ -16,6 +16,11 @@
when calling a Xi function that calls XGetExtensionVersion() (Bugzilla
#260, Bastien Nocera, Owen Taylor).
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,
+ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,):
+ Build fix when using Linux kernel 2.6 headers. (Marc La France, via
+ Michel Dänzer)
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.0 +1100
+++ xc/config/imake/imake.c2003-04-09 01:58:14.0 +1000
Roll your own X Packages problem with static libraries
Hi I am just tring to get some CVS-Head, which i injected into the experimental XFree Packages debianized. I managed to compile and install, but when i make an "debian/rules binary-arch". I get the following message: dh_install --sourcedir=debian/tmp cp: cannot stat `debian/tmp//usr/X11R6/lib/libdps.a': No such file or directory dh_install: command returned error code 256 make: *** [stampdir/binary-arch] Error 1 The problem is that there is no libdps.a build (but .so one are there!). So here comes the question to the x-wizards on the list, are there any configure options to get these static libraries built? Please cc me, since i am currently not subscribed to this list. Thanks for any suggestions Tim
X Strike Force XFree86 SVN commit: rev 759 - people/fabbione
Author: fabbione
Date: 2003-11-12 03:52:12 -0500 (Wed, 12 Nov 2003)
New Revision: 759
Removed:
people/fabbione/912_debian_glibc_header_fuckup_fix.diff
Log:
it is in branch now. Thanks Daniel
Deleted: people/fabbione/912_debian_glibc_header_fuckup_fix.diff
===
--- people/fabbione/912_debian_glibc_header_fuckup_fix.diff 2003-11-12
07:39:17 UTC (rev 758)
+++ people/fabbione/912_debian_glibc_header_fuckup_fix.diff 2003-11-12
08:52:12 UTC (rev 759)
@@ -1,45 +0,0 @@
-diff -Naurd xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
2002-10-20 23:45:27.0 +0200
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-10
11:39:43.0 +0100
-@@ -67,6 +67,7 @@
- * from util-linux-2.9t package */
-
- #include
-+#include
- #ifdef __sparc__
- #include
- #include
-diff -Naurd xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
2003-11-10 11:36:12.0 +0100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-10
11:41:58.0 +0100
-@@ -94,12 +94,20 @@
- /* kbd rate stuff based on kbdrate.c from Rik Faith <[EMAIL PROTECTED]> et.al.
- * from util-linux-2.9t package */
-
--
-+#include
-+#include
- #ifdef __sparc__
- #include
- #include
- #endif
-
-+/* Deal with spurious kernel header change */
-+#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-+# define rate period
-+# endif
-+#endif
-+
- static int
- KDKBDREP_ioctl_ok(int rate, int delay) {
- #if defined(KDKBDREP) && !defined(__sparc__)
-@@ -161,6 +169,8 @@
- #endif /* KIOCSRATE */
- }
-
-+#undef rate
-+
- static void
- SetKbdRepeat(InputInfoPtr pInfo, char rad)
- {
Re: X Strike Force XFree86 SVN commit: rev 758 - in branches/4.3.0/sid/debian: . patches
On Wed, Nov 12, 2003 at 02:39:33AM -0500, X Strike Force SVN Repository Admin wrote: > xfree86 (4.3.0-0pre1v4) experimental; urgency=low > >* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi] > @@ -2444,7 +2448,7 @@ >(Closes: #85365) > + Sync with Type1 font rasterizer from HEAD: >- Some minor include cleanups. (David Dawes) > - - Avoid redefining abort(), a well known C library function. This can > + - Avoid redefining abort(), a well known C library function. This can > cause errors when the abort() prototype from stdlib.h is included > later by Xos.h. (Matthieu Herrb) >- A "hammer" approach at ensuring font properties are freed properly. This keeps happening, doesn't show up in a svn diff, and I don't know why. If someone who can 'svn ci' a tiny changelog update in under 25 minutes cares to fix this, please do. -- Daniel Stone<[EMAIL PROTECTED]> Debian X Strike Force:http://people.debian.org/~branden/xsf/ pgp7eVO84yPUm.pgp Description: PGP signature
X Strike Force XFree86 SVN commit: rev 758 - in branches/4.3.0/sid/debian: . patches
Author: daniel
Date: 2003-11-12 02:39:17 -0500 (Wed, 12 Nov 2003)
New Revision: 758
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
* debian/patches/000_stolen_from_HEAD.diff: add '#define rate period' where
necessary to work around stupid change to newer kernels; fixes build issues.
Modified: branches/4.3.0/sid/debian/changelog
===
--- branches/4.3.0/sid/debian/changelog 2003-11-12 06:22:22 UTC (rev 757)
+++ branches/4.3.0/sid/debian/changelog 2003-11-12 07:39:17 UTC (rev 758)
@@ -86,8 +86,12 @@
- debian/control
[DROP THIS ENTRY WHEN 4.2.1-14 MERGED.]
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 1 Nov 2003 17:03:39 -0500
+ * Fix building on 2.6.x kernels by adding '#define rate period' where needed
+(thanks, Fabio di Nitto).
+- debian/patches/000_stolen_from_HEAD.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 12 Nov 2003 02:27:58 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
@@ -2444,7 +2448,7 @@
(Closes: #85365)
+ Sync with Type1 font rasterizer from HEAD:
- Some minor include cleanups. (David Dawes)
- - Avoid redefining abort(), a well known C library function. This can
+ - Avoid redefining abort(), a well known C library function. This can
cause errors when the abort() prototype from stdlib.h is included
later by Xos.h. (Matthieu Herrb)
- A "hammer" approach at ensuring font properties are freed properly.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12
06:22:22 UTC (rev 757)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12
07:39:17 UTC (rev 758)
@@ -7,6 +7,7 @@
* Drivers shouldn't have to care about recolouring ARGB cursors.
* Fix Xv regression in trident driver.
* Implement two missing relocations in the ia64 module loader.
+ * Add '#define rate period', in line with a kernel change.
(xc/lib/Xi/XExtInt.c,
xc/lib/Xi/XGetVers.c,
@@ -649,3 +650,48 @@
}
if (versions[version_index].major_version > Dont_Check)
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
2003-11-12 18:00:24.0 +1100
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12
18:01:33.0 +1100
+@@ -67,6 +67,7 @@
+ * from util-linux-2.9t package */
+
+ #include
++#include
+ #ifdef __sparc__
+ #include
+ #include
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
2003-11-12 18:00:24.0 +1100
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-12
18:01:33.0 +1100
+@@ -93,12 +93,20 @@
+ /* kbd rate stuff based on kbdrate.c from Rik Faith <[EMAIL PROTECTED]> et.al.
+ * from util-linux-2.9t package */
+
+-
++#include
++#include
+ #ifdef __sparc__
+ #include
+ #include
+ #endif
+
++/* Deal with spurious kernel header change */
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++# define rate period
++# endif
++#endif
++
+ static int
+ KDKBDREP_ioctl_ok(int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+@@ -160,6 +168,8 @@
+ #endif /* KIOCSRATE */
+ }
+
++#undef rate
++
+ static void
+ SetKbdRepeat(InputInfoPtr pInfo, char rad)
+ {
X Strike Force XFree86 SVN commit: rev 757 - branches/4.3.0/sid/debian
Author: daniel
Date: 2003-11-12 01:22:22 -0500 (Wed, 12 Nov 2003)
New Revision: 757
Modified:
branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.alpha
branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.i386
branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.ia64
branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.powerpc
Log:
* debian/xlibmesa-dri-dbg.install.{alpha,i386,ia64,powerpc}: resync all of
these with xlibmesa-dri.install.$ARCH, fixing fabbione's build problem;
these were all totally bogus - probably just blindly copied from 4.2.1.
Modified: branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.alpha
===
--- branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.alpha2003-11-12
05:26:04 UTC (rev 756)
+++ branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.alpha2003-11-12
06:22:22 UTC (rev 757)
@@ -1,6 +1,6 @@
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
+usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/radeon_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/sis_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/tdfx_dri.so /usr/X11R6/lib/modules/dri/debug
Modified: branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.i386
===
--- branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.i386 2003-11-12
05:26:04 UTC (rev 756)
+++ branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.i386 2003-11-12
06:22:22 UTC (rev 757)
@@ -1,3 +1,4 @@
+usr/X11R6/lib/modules/dri/ffb_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i810_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i830_dri.so /usr/X11R6/lib/modules/dri/debug
@@ -3,5 +4,5 @@
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
+usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/radeon_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/sis_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/tdfx_dri.so /usr/X11R6/lib/modules/dri/debug
Modified: branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.ia64
===
--- branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.ia64 2003-11-12
05:26:04 UTC (rev 756)
+++ branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.ia64 2003-11-12
06:22:22 UTC (rev 757)
@@ -1,3 +1,4 @@
+usr/X11R6/lib/modules/dri/ffb_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i810_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i830_dri.so /usr/X11R6/lib/modules/dri/debug
@@ -3,4 +4,4 @@
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
+usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/radeon_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/sis_dri.so /usr/X11R6/lib/modules/dri/debug
Modified: branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.powerpc
===
--- branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.powerpc 2003-11-12
05:26:04 UTC (rev 756)
+++ branches/4.3.0/sid/debian/xlibmesa-dri-dbg.install.powerpc 2003-11-12
06:22:22 UTC (rev 757)
@@ -1,4 +1,6 @@
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
+usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/radeon_dri.so /usr/X11R6/lib/modules/dri/debug
+usr/X11R6/lib/modules/dri/tdfx_dri.so /usr/X11R6/lib/modules/dri/debug
