summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2004-09-09 17:26:11 +0000
committerSeemant Kulleen <seemant@gentoo.org>2004-09-09 17:26:11 +0000
commit0a4078296e3b72bba7cd608219e4552397f3ffc7 (patch)
treed9d8d7513e8514b29bbbbdaa667e27333575c253 /x11-base
parentepkgmove sucks!!!!!!!!!!! (diff)
downloadgentoo-2-0a4078296e3b72bba7cd608219e4552397f3ffc7.tar.gz
gentoo-2-0a4078296e3b72bba7cd608219e4552397f3ffc7.tar.bz2
gentoo-2-0a4078296e3b72bba7cd608219e4552397f3ffc7.zip
keyboard->kbd in XF86Config as well as xorg.conf
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog5
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 7f374066a576..6760749e027b 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.109 2004/09/09 06:58:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.110 2004/09/09 17:26:11 seemant Exp $
+
+ 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+ keyboard->kbd in XF86Config as well as xorg.conf
08 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
For users with cascading profiles, the bitmap-fonts and xprint USE flags will
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
index 005376bd43dd..6764dba36efa 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.5 2004/09/09 08:30:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.6 2004/09/09 17:26:11 seemant Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -813,7 +813,7 @@ update_config_files() {
sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \
${ROOT}${FILE} > ${IMAGE}${FILE}
- if [ "${FILE}" = "/etc/X11/xorg.conf" ]
+ if [ "${FILE}" = "/etc/X11/xorg.conf" -o "${FILE}" = "/etc/X11/XF86Config" ] ]
then
# "keyboard" driver is deprecated and will be removed,
# switch to "kbd"