wok-stable rev 9850

Up: kbd to 1.15.3.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun May 15 21:55:14 2011 +0000 (2011-05-15)
parents 7049937aebb0
children 3f989c266063
files kbd-base/receipt kbd/receipt kbd/stuff/fix-es.po.patch
line diff
     1.1 --- a/kbd-base/receipt	Sun May 15 21:24:29 2011 +0000
     1.2 +++ b/kbd-base/receipt	Sun May 15 21:55:14 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd-base"
     1.7 -VERSION="1.12"
     1.8 +VERSION="1.15.3"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Keyboard maping definitions and loadkeys utility."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -15,12 +15,13 @@
    1.13  		$fs/usr/share/kbd/keymaps/i386/azerty \
    1.14  		$fs/usr/share/kbd/keymaps/i386/dvorak \
    1.15  		$fs/usr/share/kbd/keymaps/i386/qwerty \
    1.16 -		$fs/usr/share/kbd/keymaps/i386/qwertz
    1.17 +		$fs/usr/share/kbd/keymaps/i386/qwertz \
    1.18 +		$fs/bin
    1.19  		
    1.20 -	cp -a $_pkg/bin $fs
    1.21 +	cp -a $_pkg/usr/bin/loadkeys $fs/bin
    1.22  	
    1.23  	# i386 keymaps only.
    1.24 -	for keymap in `cat stuff/keymaps-path.list`
    1.25 +	for keymap in `cat $stuff/keymaps-path.list`
    1.26  	do
    1.27  		cp -a $_pkg/usr/share/kbd/keymaps/i386/$keymap \
    1.28  			$fs/usr/share/kbd/keymaps/i386/$keymap
     2.1 --- a/kbd/receipt	Sun May 15 21:24:29 2011 +0000
     2.2 +++ b/kbd/receipt	Sun May 15 21:55:14 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="kbd"
     2.7 -VERSION="1.12"
     2.8 +VERSION="1.15.3"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Keyboard maping definitions and tools."
    2.11  BUILD_DEPENDS="flex"
    2.12 @@ -15,11 +15,10 @@
    2.13  compile_rules()
    2.14  {
    2.15  	cd $src
    2.16 -	./configure \
    2.17 -		--prefix=/usr \
    2.18 -		--mandir=/usr/share/man
    2.19 -	make
    2.20 -	make DESTDIR=$PWD/_pkg install
    2.21 +	patch -Np1 -i $stuff/fix-es.po.patch
    2.22 +	./configure --datadir=/usr/share/kbd && 
    2.23 +	make && 
    2.24 +	make install
    2.25  }
    2.26  
    2.27  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.28 @@ -48,9 +47,9 @@
    2.29  
    2.30  post_remove()
    2.31  {
    2.32 -	ln -s /bin/busybox /usr/bin/deallocvt
    2.33 -	ln -s /bin/busybox /usr/bin/chvt
    2.34 -	ln -s /bin/busybox /usr/bin/setkeycodes
    2.35 -	ln -s /bin/busybox /usr/bin/openvt
    2.36 -	ln -s /bin/busybox /usr/bin/kbd_mode
    2.37 +	ln -s /bin/busybox $1/usr/bin/deallocvt
    2.38 +	ln -s /bin/busybox $1/usr/bin/chvt
    2.39 +	ln -s /bin/busybox $1/usr/bin/setkeycodes
    2.40 +	ln -s /bin/busybox $1/usr/bin/openvt
    2.41 +	ln -s /bin/busybox $1/usr/bin/kbd_mode
    2.42  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/kbd/stuff/fix-es.po.patch	Sun May 15 21:55:14 2011 +0000
     3.3 @@ -0,0 +1,11 @@
     3.4 +--- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
     3.5 ++++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
     3.6 +@@ -1363,7 +1363,7 @@
     3.7 + #: src/setfont.c:682
     3.8 + #, c-format
     3.9 + msgid "Saved %d-char %dx%d font file on %s\n"
    3.10 +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
    3.11 ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
    3.12 + 
    3.13 + #: src/setkeycodes.c:21
    3.14 + #, c-format