X Strike Force X.Org X11 SVN commit: r1412 - in branches/modular/app/xfs-X11R7.0-1.0.1/debian: . patches
Author: dnusinow
Date: 2006-03-07 22:15:17 -0500 (Tue, 07 Mar 2006)
New Revision: 1412
Modified:
branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog
branches/modular/app/xfs-X11R7.0-1.0.1/debian/patches/02_debian_setup.diff
Log:
+ Update config.cpp patch for our font locations and remove the cache
options because they're not working
Modified: branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-03-08 03:06:25 UTC (rev 1411)
+++ branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-03-08 03:15:17 UTC (rev 1412)
@@ -2,8 +2,10 @@
* Provide all our old packaging infrastrcture that I totally forgot. Thanks
Rasmus Bøg Hansen. (closes: #355762)
+ + Update config.cpp patch for our font locations and remove the cache
+ options because they're not working
- -- David Nusinow <dnusinow@debian.org> Tue, 7 Mar 2006 21:59:15 -0500
+ -- David Nusinow <dnusinow@debian.org> Tue, 7 Mar 2006 22:14:35 -0500
xfs (1:1.0.1-1) experimental; urgency=low
Modified: branches/modular/app/xfs-X11R7.0-1.0.1/debian/patches/02_debian_setup.diff
===================================================================
--- branches/modular/app/xfs-X11R7.0-1.0.1/debian/patches/02_debian_setup.diff 2006-03-08 03:06:25 UTC (rev 1411)
+++ branches/modular/app/xfs-X11R7.0-1.0.1/debian/patches/02_debian_setup.diff 2006-03-08 03:15:17 UTC (rev 1412)
@@ -4,9 +4,11 @@
This patch by Branden Robinson.
---- config.cpp~ Wed Jan 17 23:45:27 2001
-+++ config.cpp Mon Jun 4 01:34:15 2001
-@@ -1,15 +1,24 @@
+Index: config.cpp
+===================================================================
+--- config.cpp.orig 2006-03-07 22:09:01.000000000 -0500
++++ config.cpp 2006-03-07 22:13:53.000000000 -0500
+@@ -1,15 +1,19 @@
XCOMM font server configuration file
XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
@@ -23,15 +25,14 @@
+XCOMM turn off TCP port listening (Unix domain connections are still permitted)
+no-listen = tcp
+XCOMM paths to search for fonts
-+catalogue = /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/cyrillic/,/usr/lib/X11/fonts/100dpi/:unscaled,/usr/lib/X11/fonts/75dpi/:unscaled,/usr/lib/X11/fonts/Type1/,/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/75dpi/
++catalogue = /usr/share/fonts/X11/misc/,/usr/share/fonts/X11/cyrillic/,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1/,/usr/share/fonts/X11/100dpi/,/usr/share/fonts/X11/75dpi/
XCOMM in decipoints
default-point-size = 120
-default-resolutions = 75,75,100,100
+-
+-XCOMM font cache control, specified in KB
+-cache-hi-mark = 2048
+-cache-low-mark = 1433
+-cache-balance = 70
+XCOMM x1,y1,x2,y2,...
+default-resolutions = 100,100,75,75
-
--XCOMM font cache control, specified in KB
-+XCOMM font cache control, specified in kB
- cache-hi-mark = 2048
- cache-low-mark = 1433
- cache-balance = 70
Reply to: