X Strike Force X.Org X11 SVN commit: r2104 - in trunk/debian/xorg/debian: . local
Author: vorlon
Date: 2006-05-06 00:29:48 -0400 (Sat, 06 May 2006)
New Revision: 2104
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/local/dexconf
Log:
Fix dexconf to supply the same backwards-compatible FontPath rules on
upgrade as the ones we're forcing in the postinst for non-dexconf users.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-05-05 16:41:41 UTC (rev 2103)
+++ trunk/debian/xorg/debian/changelog 2006-05-06 04:29:48 UTC (rev 2104)
@@ -1,3 +1,11 @@
+xorg (1:7.0.18) unstable; urgency=low
+
+ * Fix dexconf to supply the same backwards-compatible FontPath rules
+ on upgrade as the ones we're forcing in the postinst for non-dexconf
+ users.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 5 May 2006 21:27:27 -0700
+
xorg (1:7.0.17) unstable; urgency=high
[ Steve Langasek ]
Modified: trunk/debian/xorg/debian/local/dexconf
===================================================================
--- trunk/debian/xorg/debian/local/dexconf 2006-05-05 16:41:41 UTC (rev 2103)
+++ trunk/debian/xorg/debian/local/dexconf 2006-05-06 04:29:48 UTC (rev 2104)
@@ -203,12 +203,19 @@
cat >&4 <<SECTION
Section "Files"
FontPath "/usr/share/fonts/X11/misc"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc"
FontPath "/usr/share/fonts/X11/cyrillic"
+ FontPath "/usr/X11R6/lib/X11/fonts/cyrillic"
FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
FontPath "/usr/share/fonts/X11/Type1"
+ FontPath "/usr/X11R6/lib/X11/fonts/Type1"
FontPath "/usr/share/fonts/X11/100dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi"
FontPath "/usr/share/fonts/X11/75dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi"
# path to defoma fonts
FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
EndSection
Reply to: