X Strike Force X.Org X11 SVN commit: r620 - in branches/6.9/debian: . local
Author: dnusinow
Date: 2005-09-25 21:52:41 -0500 (Sun, 25 Sep 2005)
New Revision: 620
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/local/dexconf
branches/6.9/debian/xserver-xorg.templates
Log:
* Add support for preseeding fontserver. Thanks Petter Reinholdtsen.
(closes: #323262)
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-24 22:19:03 UTC (rev 619)
+++ branches/6.9/debian/changelog 2005-09-26 02:52:41 UTC (rev 620)
@@ -8,8 +8,10 @@
* Allow patch target to succeed if there simply are no patches available
* Ship XlibConf.h in libx11-dev. This will allow non-imake packages to biuld
against X, including Xrender
+ * Add support for preseeding fontserver. Thanks Petter Reinholdtsen.
+ (closes: #323262)
- -- David Nusinow <dnusinow@debian.org> Mon, 19 Sep 2005 20:57:43 -0400
+ -- David Nusinow <dnusinow@debian.org> Sun, 25 Sep 2005 22:51:12 -0400
xorg-x11 (6.8.99.900.dfsg.1-0pre1) experimental; urgency=low
Modified: branches/6.9/debian/local/dexconf
===================================================================
--- branches/6.9/debian/local/dexconf 2005-09-24 22:19:03 UTC (rev 619)
+++ branches/6.9/debian/local/dexconf 2005-09-26 02:52:41 UTC (rev 620)
@@ -247,10 +247,21 @@
fetch $TEMPLATE_BASE/config/write_files_section
if [ "$RET" = "true" ]; then
+ db_get $TEMPLATE_BASE/config/fontpath/fontserver
+ if [ -n "$RET" ] ; then
+ FONTSERVER="$RET"
+ else
+ FONTSERVER=""
+ fi
exec 4>"$DEXCONFTMPDIR/Files"
cat >&4 <<SECTION
Section "Files"
FontPath "unix/:7100" # local font server
+SECTION
+ if [ -n "$FONTSERVER" ] ; then
+ echo " FontPath \"$FONTSERVER\"" >&4
+ fi
+ cat >&4 <<SECTION
# 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"
Modified: branches/6.9/debian/xserver-xorg.templates
===================================================================
--- branches/6.9/debian/xserver-xorg.templates 2005-09-24 22:19:03 UTC (rev 619)
+++ branches/6.9/debian/xserver-xorg.templates 2005-09-26 02:52:41 UTC (rev 620)
@@ -536,3 +536,8 @@
Type: note
_Description: Please enter only a numeric value.
Characters other than digits are not allowed in the entry.
+
+Template: xserver-xorg/config/fontpath/fontserver
+Type: string
+_Description: Extra fontpath URL
+ This is an internal (hidden) debconf question. It should not be translated.
Reply to: