xorg: Changes to 'debian-experimental'
debian/changelog | 3 ++-
debian/local/dexconf | 9 +--------
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 203f0e7c87c3ec6c0a259c93075dce249c66a0b9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 30 02:58:49 2007 +0200
dexconf: don't add fontpaths in /usr/X11R6.
These transitional paths should hopefully be unneeded after etch.
Also fix the comment at the top of the output file to refer to
"man xorg.conf" instead of "man /etc/X11/xorg.conf".
diff --git a/debian/changelog b/debian/changelog
index acd3947..f445d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop references to obsolete modules in the debconf templates.
+ * dexconf: don't add fontpaths in /usr/X11R6.
- -- Julien Cristau <jcristau@debian.org> Thu, 29 Mar 2007 21:24:47 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 02:56:35 +0200
xorg (1:7.2-1) experimental; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 2fd47d1..5bbdb5f 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -127,7 +127,7 @@ XSERVERPKG="$RET"
case "$XSERVERPKG" in
xserver-xorg|xserver-xorg-dbg|xserver-xorg-core)
: ${XF86CONFIG:=/etc/X11/xorg.conf}
- REALCONFIG="/etc/X11/xorg.conf"
+ REALCONFIG="xorg.conf"
SERVER="xorg"
;;
*)
@@ -217,19 +217,12 @@ SECTION
fi
cat >&4 <<SECTION
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: