[Frugalware-git] frugalware-current: xorg-server-1.8.2-3-i686

[Miklos Vajna]

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

commit af47ef068530e2f835bbfd725797cc720e703e32
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Jul 9 14:27:35 2010 +0200

xorg-server-1.8.2-3-i686

- fix install scriptlet so he'll have us keyboard when LANG is empty

diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild
index 4076ac1..3c92d1e 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=2
+pkgrel=3
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 58d9d1f..f24da12 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -1,8 +1,7 @@
post_install()
{
-	if [ "$LANG" = "en_US" ]; then
-		layout="us"
-	else
+	layout="us"
+	if [ -n "$LANG" -a "$LANG" != "en_US" ]; then
layout=${LANG:0:2}
fi
echo "Update layout keyboard with $layout"