diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2004-09-10 04:59:27 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2004-09-10 04:59:27 +0000 |
| commit | e11ff474e16f5f4d0d370ab20276f7ed17bcf357 (patch) | |
| tree | 67264f1762fdb9c8fb3784129c255377c5c52719 /x11-base | |
| parent | Version bump. (Manifest recommit) (diff) | |
| download | gentoo-2-e11ff474e16f5f4d0d370ab20276f7ed17bcf357.tar.gz gentoo-2-e11ff474e16f5f4d0d370ab20276f7ed17bcf357.tar.bz2 gentoo-2-e11ff474e16f5f4d0d370ab20276f7ed17bcf357.zip | |
check XF86Config-4, and also fix the if condition
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 07d2069eea21..58faae29466b 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.111 2004/09/09 22:19:50 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.112 2004/09/10 04:59:27 seemant Exp $ + + 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: + check XF86Config-4, and also fix the if condition 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: adjust the regex to fix bug #63425 by Don Seiler <rizzo@gentoo.org> 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 28d1ac32ef87..2c964bcda8d7 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.8 2004/09/09 22:19:50 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.9 2004/09/10 04:59:27 seemant Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -800,6 +800,7 @@ update_config_files() { then einfo "Preparing any installed configuration files for font move..." FILES="/etc/X11/xorg.conf + /etc/X11/XF86Config-4 /etc/X11/XF86Config /etc/X11/fs/config" # /etc/fonts/fonts.conf @@ -813,7 +814,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" -o "${FILE}" = "/etc/X11/XF86Config" ] ] + if [ "${FILE}" = "/etc/X11/xorg.conf" ] || [ "${FILE}" = "/etc/X11/XF86Config" ] || [ "${FILE}" = "/etc/X11/XF86Config-4" ] then # "keyboard" driver is deprecated and will be removed, # switch to "kbd" |