# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1305496514 0
# Node ID eef7c8c8ad4eb791c344256ba8eaa6983a9c8582
# Parent  7049937aebb035d84d044d77908ca8fbe4778c6c
Up: kbd to 1.15.3.

diff -r 7049937aebb0 -r eef7c8c8ad4e kbd-base/receipt
--- a/kbd-base/receipt	Sun May 15 21:24:29 2011 +0000
+++ b/kbd-base/receipt	Sun May 15 21:55:14 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-base"
-VERSION="1.12"
+VERSION="1.15.3"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard maping definitions and loadkeys utility."
 MAINTAINER="pankso@slitaz.org"
@@ -15,12 +15,13 @@
 		$fs/usr/share/kbd/keymaps/i386/azerty \
 		$fs/usr/share/kbd/keymaps/i386/dvorak \
 		$fs/usr/share/kbd/keymaps/i386/qwerty \
-		$fs/usr/share/kbd/keymaps/i386/qwertz
+		$fs/usr/share/kbd/keymaps/i386/qwertz \
+		$fs/bin
 		
-	cp -a $_pkg/bin $fs
+	cp -a $_pkg/usr/bin/loadkeys $fs/bin
 	
 	# i386 keymaps only.
-	for keymap in `cat stuff/keymaps-path.list`
+	for keymap in `cat $stuff/keymaps-path.list`
 	do
 		cp -a $_pkg/usr/share/kbd/keymaps/i386/$keymap \
 			$fs/usr/share/kbd/keymaps/i386/$keymap
diff -r 7049937aebb0 -r eef7c8c8ad4e kbd/receipt
--- a/kbd/receipt	Sun May 15 21:24:29 2011 +0000
+++ b/kbd/receipt	Sun May 15 21:55:14 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd"
-VERSION="1.12"
+VERSION="1.15.3"
 CATEGORY="system-tools"
 SHORT_DESC="Keyboard maping definitions and tools."
 BUILD_DEPENDS="flex"
@@ -15,11 +15,10 @@
 compile_rules()
 {
 	cd $src
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man
-	make
-	make DESTDIR=$PWD/_pkg install
+	patch -Np1 -i $stuff/fix-es.po.patch
+	./configure --datadir=/usr/share/kbd && 
+	make && 
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -48,9 +47,9 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/deallocvt
-	ln -s /bin/busybox /usr/bin/chvt
-	ln -s /bin/busybox /usr/bin/setkeycodes
-	ln -s /bin/busybox /usr/bin/openvt
-	ln -s /bin/busybox /usr/bin/kbd_mode
+	ln -s /bin/busybox $1/usr/bin/deallocvt
+	ln -s /bin/busybox $1/usr/bin/chvt
+	ln -s /bin/busybox $1/usr/bin/setkeycodes
+	ln -s /bin/busybox $1/usr/bin/openvt
+	ln -s /bin/busybox $1/usr/bin/kbd_mode
 }
diff -r 7049937aebb0 -r eef7c8c8ad4e kbd/stuff/fix-es.po.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kbd/stuff/fix-es.po.patch	Sun May 15 21:55:14 2011 +0000
@@ -0,0 +1,11 @@
+--- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
++++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
+@@ -1363,7 +1363,7 @@
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+ 
+ #: src/setkeycodes.c:21
+ #, c-format