Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=eb05af8156d13484e81bf6457574dd57601c573c

commit eb05af8156d13484e81bf6457574dd57601c573c
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Jul 8 20:14:31 2010 +0200

xorg-server-1.8.2-2-x86_64
*use layout us for LANG=en_US
*wait the sync and merge xorgtesting :)

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 54798dc..4076ac1 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.8.2
-pkgrel=1
+pkgrel=2
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 c10d8a0..58d9d1f 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -1,7 +1,12 @@
post_install()
-{
-       echo "Update layout keyboard with ${LANG:0:2}"
-       sed -i "/xkb_layout/s/Keyboard_Layout/${LANG:0:2}/" 
/etc/X11/xorg.conf.d/10-evdev.conf
+{
+       if [ "$LANG" = "en_US" ]; then
+               layout="us"
+       else
+               layout=${LANG:0:2}
+       fi
+       echo "Update layout keyboard with $layout"
+       sed -i "/xkb_layout/s/Keyboard_Layout/$layout/" 
/etc/X11/xorg.conf.d/10-evdev.conf
}

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

Reply via email to