Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ca1507d626dd0d6ace0b6f0de539e21dbe8c38f

commit 6ca1507d626dd0d6ace0b6f0de539e21dbe8c38f
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Oct 21 21:13:22 2010 +0000

xorg-server-1.9.0-6-i686
*for uk console set layout gb
*closes #4353
*added a case for some other exceptions if needed

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 97e0784..16dd123 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -10,7 +10,7 @@ USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"}

pkgname=xorg-server
pkgver=1.9.0
-pkgrel=5
+pkgrel=6
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
diff --git a/source/x11/xorg-server/xorg-server.install 
b/source/x11/xorg-server/xorg-server.install
index 1c6c9fe..272f059 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -19,21 +19,16 @@ post_install()
if [ -e /etc/sysconfig/keymap ]; then
# setting the layout from the tty console layout created by the installer
layout=`awk -F'=' '/keymap=/ {print $2}' /etc/sysconfig/keymap | sed 's|-.*||g'`
+               #if we should fix some others layout
+               #FS#4353
+               case "$layout" in
+                       "uk") layout=gb  ;;
+
+               esac
fi
echo "Update layout keyboard with $layout"
sed -i "/xkb_layout/s/Keyboard_Layout/$layout/" 
/etc/X11/xorg.conf.d/10-evdev.conf
-       #setting graphical device
-       #device=`lspci | grep "VGA compatible controller" | cut -d ' ' -f 5`
-       #device=`echo $device | tr '[:upper:]' '[:lower:]'`
-       #case "$device" in
-       #       "via") UpdateConf openchrome ;;
-       #       "intel") UpdateConf intel ;;
-       #       "nvidia") UpdateConf nouveau ;;
-       #       "ati") UpdateConf radeon ;;
-       #       "sis") UpdateConf sis ;;
-       #       "cirrus") UpdateConf cirrus ;;
-       #       *) UpdateConf vesa ;;
-       #esac
+
}

post_upgrade()
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to