Author: branden
Date: 2004-02-09 01:52:17 -0500 (Mon, 09 Feb 2004)
New Revision: 1016
Modified:
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/local/dexconf
branches/4.3.0/sid/debian/patches/906_debian_xfs.diff
Log:
Revert reordering of xfs's default font catalogue (and default font path
element order in XFree86 X server configuration files written by dexconf)
performed in 4.2.1-6. Low-resolution character-cell fonts (such as those
used by terminal emulators) come first, followed by unscaled 100dpi and
75dpi bitmap fonts, followed by Type1 fonts (after the unscaled bitmap
fonts, because the type1 rasterizer in X is not very good), CID, and
Speedo fonts, and finally scaled 100dpi and 75dpi fonts. Attempting to
follow the advice in README.fonts just doesn't work too well for us.
(Closes: #199111)
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-02-09 06:20:00 UTC (rev 1015)
+++ branches/4.3.0/sid/debian/TODO 2004-02-09 06:52:17 UTC (rev 1016)
@@ -6,11 +6,6 @@
* Fix the freakin' Xcursor-shared-object-search in Xlib.
http://lists.debian.org/debian-x/2004/debian-x-200401/msg00475.html
* PATCH APPLIED, FIX NEEDS TESTING
-* Investigate/forward-port the following patches from trunk:
- + 906_debian_xfs
- (see patch forward-port status chart below for more details)
-* Rearrange FPEs written by dexconf to revert advice taken from README.fonts,
- and match patch #906.
Post 4.3.0-1
============
@@ -217,7 +212,7 @@
903_debian_system.twmrc.diff unchanged
904_debian_xinitrc.diff unchanged
905_debian_xdm.diff unchanged
-906_debian_xfs.diff merged
Imakefile change upstream, FONT PATH CATALOG UNDER REVIEW
+906_debian_xfs.diff merged
Imakefile change upstream
907_debian_xterm.diff unchanged some
app-defaults changes now on HEAD, but not stolen yet
908_debian_no_non-free_stuff.diff merged renamed
to 908_debian_exclude_non_free_fonts_and_docs
909_debian_XF86Config_to_XF86Config-4.diff merged renamed
to 911_debian_XF86Config_to_XF86Config-4
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-02-09 06:20:00 UTC (rev 1015)
+++ branches/4.3.0/sid/debian/changelog 2004-02-09 06:52:17 UTC (rev 1016)
@@ -180,8 +180,20 @@
debconf-updatepo. (Closes: #231531)
- debian/po/cs.po: new
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 8 Feb 2004 15:46:05 -0500
+ * Revert reordering of xfs's default font catalogue (and default font path
+ element order in XFree86 X server configuration files written by dexconf)
+ performed in 4.2.1-6. Low-resolution character-cell fonts (such as those
+ used by terminal emulators) come first, followed by unscaled 100dpi and
+ 75dpi bitmap fonts, followed by Type1 fonts (after the unscaled bitmap
+ fonts, because the type1 rasterizer in X is not very good), CID, and
+ Speedo fonts, and finally scaled 100dpi and 75dpi fonts. Attempting to
+ follow the advice in README.fonts just doesn't work too well for us.
+ (Closes: #199111)
+ - debian/local/dexconf
+ - debian/patches/906_debian_xfs.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 9 Feb 2004 01:43:56 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/local/dexconf
===================================================================
--- branches/4.3.0/sid/debian/local/dexconf 2004-02-09 06:20:00 UTC (rev
1015)
+++ branches/4.3.0/sid/debian/local/dexconf 2004-02-09 06:52:17 UTC (rev
1016)
@@ -219,13 +219,13 @@
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/Type1"
- FontPath "/usr/lib/X11/fonts/CID"
- FontPath "/usr/lib/X11/fonts/Speedo"
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/CID"
+ FontPath "/usr/lib/X11/fonts/Speedo"
FontPath "/usr/lib/X11/fonts/100dpi"
FontPath "/usr/lib/X11/fonts/75dpi"
EndSection
@@ -238,11 +238,13 @@
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/CID"
FontPath "/usr/lib/X11/fonts/Speedo"
- FontPath "/usr/lib/X11/fonts/misc"
- FontPath "/usr/lib/X11/fonts/cyrillic"
FontPath "/usr/lib/X11/fonts/100dpi"
FontPath "/usr/lib/X11/fonts/75dpi"
EndSection
Modified: branches/4.3.0/sid/debian/patches/906_debian_xfs.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/906_debian_xfs.diff 2004-02-09
06:20:00 UTC (rev 1015)
+++ branches/4.3.0/sid/debian/patches/906_debian_xfs.diff 2004-02-09
06:52:17 UTC (rev 1016)
@@ -1,8 +1,9 @@
$Id$
-Change XFS to be slightly more sane by default. This patch originally by
-Branden Robinson.
+Set up defaults that make more sense for Debian.
+This patch by Branden Robinson.
+
--- xc/programs/xfs/config.cpp~ Wed Jan 17 23:45:27 2001
+++ xc/programs/xfs/config.cpp Mon Jun 4 01:34:15 2001
@@ -1,15 +1,24 @@
