# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1345709652 -7200
# Node ID ef61195e92585bf2d9c9664918da0866164cf40c
# Parent  fbb0f6a5043a1c8cb20d1bf2b00b57dc03827b15
Add X keyboard name aliases in kbd-base (Bug 19)

diff -r fbb0f6a5043a -r ef61195e9258 kbd-base/receipt
--- a/kbd-base/receipt	Thu Aug 23 09:27:46 2012 +0200
+++ b/kbd-base/receipt	Thu Aug 23 10:14:12 2012 +0200
@@ -35,5 +35,11 @@
 		$fs/usr/share/kbd/keymaps
 	cp -a $install/usr/share/kbd/keymaps/i386/include \
 		$fs/usr/share/kbd/keymaps/i386/include
+	# X11 keyboard aliases
+	while read X keymap ; do
+		ln -s $keymap.map.gz $fs/usr/share/kbd/keymaps/i386/$X.map.gz
+	done <<EOT
+qwertz/hr	croat
+EOT
 }
 
diff -r fbb0f6a5043a -r ef61195e9258 syslinux/receipt
--- a/syslinux/receipt	Thu Aug 23 09:27:46 2012 +0200
+++ b/syslinux/receipt	Thu Aug 23 10:14:12 2012 +0200
@@ -44,16 +44,19 @@
     rm -f $fs/boot/isolinux/display.txt
     ( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd
     while read label kbd loc menu; do
-        #[ -s $src/$kbd.kbd ] || continue
-	cat >> $fs/boot/isolinux/i18n.cfg <<EOT
+        for i in ${kbd/,/ }; do
+	        [ -e $src/$i.kbd ] || continue
+		cat >> $fs/boot/isolinux/i18n.cfg <<EOT
 
 LABEL $label
 	MENU LABEL $menu
 	com32 c32box.c32
-	append kbdmap cpio.kbd $kbd.kbd lang=$loc kmap=$kbd
+	append kbdmap cpio.kbd $i.kbd lang=$loc kmap=$i
 EOT
+		break
+	done
     done <<EOT
-cr		croat		hr_HR		Hvratski
+cr		hr,croat	hr_HR		Hvratski
 cz		cz-lat2		cs_CZ		Cesky
 de		de-latin1	de_DE@euro	Deutsch
 de_CH\ deCH	de_CH-latin1	de_DE		Deutsch Schweitz