X Strike Force X.Org X11 SVN commit: r4203 - in trunk/debian/xorg/debian: . local
Author: dnusinow
Date: 2007-01-14 17:49:42 -0500 (Sun, 14 Jan 2007)
New Revision: 4203
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/local/dexconf
trunk/debian/xorg/debian/xserver-xorg.templates
Log:
* Permit pre-seeding for font server in dexconf. This adds a new hidden
template that does not need to be translated. Thanks Petter Reinholdtsen
for the original report and patch, and Damyan Ivanov for noticing the
regression. Closes: #323262
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2007-01-12 17:24:31 UTC (rev 4202)
+++ trunk/debian/xorg/debian/changelog 2007-01-14 22:49:42 UTC (rev 4203)
@@ -1,9 +1,16 @@
xorg (1:7.1.0-11) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Added Tamil debconf translation (closes: #406306).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 10 Jan 2007 13:18:22 +0100
+ [ David Nusinow ]
+ * Permit pre-seeding for font server in dexconf. This adds a new hidden
+ template that does not need to be translated. Thanks Petter Reinholdtsen
+ for the original report and patch, and Damyan Ivanov for noticing the
+ regression. Closes: #323262
+ -- David Nusinow <dnusinow@debian.org> Sun, 14 Jan 2007 17:48:24 -0500
+
xorg (1:7.1.0-10) unstable; urgency=low
* Change the Depends of xserver-xorg back to xserver-xorg-video-all |
Modified: trunk/debian/xorg/debian/local/dexconf
===================================================================
--- trunk/debian/xorg/debian/local/dexconf 2007-01-12 17:24:31 UTC (rev 4202)
+++ trunk/debian/xorg/debian/local/dexconf 2007-01-14 22:49:42 UTC (rev 4203)
@@ -200,9 +200,20 @@
fetch xserver-$SERVER/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"
+SECTION
+ if [ -n "$FONTSERVER" ] ; then
+ echo " FontPath \"$FONTSERVER\"" >&4
+ fi
+ cat >&4 <<SECTION
FontPath "/usr/share/fonts/X11/misc"
FontPath "/usr/X11R6/lib/X11/fonts/misc"
FontPath "/usr/share/fonts/X11/cyrillic"
Modified: trunk/debian/xorg/debian/xserver-xorg.templates
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.templates 2007-01-12 17:24:31 UTC (rev 4202)
+++ trunk/debian/xorg/debian/xserver-xorg.templates 2007-01-14 22:49:42 UTC (rev 4203)
@@ -471,3 +471,8 @@
.
Choose this option if you want the keyboard layout to be redetected. Do not
choose it if you want to keep your current layout.
+
+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: