X Strike Force X.Org X11 SVN commit: r1379 - in branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian: . patches
Author: dnusinow
Date: 2006-03-05 19:53:56 -0500 (Sun, 05 Mar 2006)
New Revision: 1379
Added:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/09_debian_xserver_rtff.diff
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
Log:
* Port patches from trunk
+ debian/910_debian_Xserver_RTFF.diff
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-03-05 01:02:29 UTC (rev 1378)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-03-06 00:53:56 UTC (rev 1379)
@@ -10,13 +10,14 @@
+ arm/315_arm_is_not_x86_and_has_no_vga.diff
+ general/099e_xorgconf_manpage_overhaul.diff
+ s390/500_s390_support.diff
+ + debian/910_debian_Xserver_RTFF.diff
* add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather
than one byte at a time. This patch by Alex Williamson and forwarded to us
by Dann Frazier. Thanks to both of them. (closes: #353168)
* Don't build xserver-xorg-core on s390. This means putting all the other
arches as being explicitly listed. Damn !s390.
- -- David Nusinow <dnusinow@debian.org> Sat, 4 Mar 2006 19:38:44 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Mar 2006 19:52:48 -0500
xorg-server (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/09_debian_xserver_rtff.diff
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/09_debian_xserver_rtff.diff 2006-03-05 01:02:29 UTC (rev 1378)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/09_debian_xserver_rtff.diff 2006-03-06 00:53:56 UTC (rev 1379)
@@ -0,0 +1,52 @@
+$Id: 910_debian_Xserver_RTFF.diff 486 2005-08-03 04:51:11Z dnusinow $
+
+Give the user a far stronger clue as to what to do when their font configuration
+is horribly screwed up; this patch by Branden Robinson.
+
+Index: dix/main.c
+===================================================================
+--- dix/main.c.orig 2006-03-05 19:50:04.000000000 -0500
++++ dix/main.c 2006-03-05 19:51:59.000000000 -0500
+@@ -409,10 +409,42 @@
+ defaultFontPath);
+ }
+ if (!SetDefaultFont(defaultTextFont))
++#ifdef DEBIAN
++ FatalError("could not open default font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have the\n"
++"\"xorg\" package installed.\n"
++"# apt-get install xorg\n"
++"\n"
++"Other useful commands to run include:\n"
++"$ dpkg --status x11-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
++#else
+ FatalError("could not open default font '%s'", defaultTextFont);
++#endif
+ if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0)))
++#ifdef DEBIAN
++ FatalError("could not open default cursor font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have the\n"
++"\"xorg\" package installed.\n"
++"# apt-get install xorg\n"
++"\n"
++"Other useful commands to run include:\n"
++"$ dpkg --status x11-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
++#else
+ FatalError("could not open default cursor font '%s'",
+ defaultCursorFont);
++#endif
+ #ifdef DPMSExtension
+ /* check all screens, looking for DPMS Capabilities */
+ DPMSCapableFlag = DPMSSupported();
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-03-05 01:02:29 UTC (rev 1378)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-03-06 00:53:56 UTC (rev 1379)
@@ -6,3 +6,4 @@
06_arm_is_not_x86_and_has_no_vga.diff -p3
07_xorgconf_manpage_overhaul.diff -p0
08_s390_servermd.diff -p3
+09_debian_xserver_rtff.diff -p0
Reply to: