wok-current rev 22981
updated kbd, kbd-base, kbd-busybox and kbd-vlock (2.0.4 -> 2.2.0)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sat Feb 29 17:01:43 2020 +0100 (2020-02-29) |
| parents | 78937c4bff2e |
| children | 904d944562cd |
| files | kbd-base/receipt kbd-busybox/receipt kbd-vlock/receipt kbd/receipt |
line diff
1.1 --- a/kbd-base/receipt Sat Feb 29 16:45:43 2020 +0100 1.2 +++ b/kbd-base/receipt Sat Feb 29 17:01:43 2020 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="kbd-base" 1.7 -VERSION="2.0.4" 1.8 +VERSION="2.2.0" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -9,6 +9,7 @@ 1.13 WEB_SITE="http://kbd-project.org/" 1.14 1.15 WANTED="kbd" 1.16 + 1.17 HOST_ARCH="i486 arm" 1.18 1.19 # Make sure it will run on host or no keyboard support... 1.20 @@ -22,29 +23,33 @@ 1.21 genpkg_rules() 1.22 { 1.23 mkdir -p $fs/bin 1.24 - cp -a $install/usr/bin/loadkeys $install/usr/bin/setfont $fs/bin 1.25 + cp -a $install/usr/bin/loadkeys $fs/bin 1.26 + cp -a $install/usr/bin/setfont $fs/bin 1.27 1.28 - # Dirs 1.29 - for dir in dvorak azerty qwerty qwertz; do 1.30 + # Directories 1.31 + for dir in dvorak azerty qwerty qwertz 1.32 + do 1.33 mkdir -p $fs/usr/share/kbd/keymaps/i386/$dir 1.34 - done 1.35 + done 1.36 1.37 # i386 keymaps only. 1.38 - for keymap in $(cat $stuff/keymaps-path.list); do 1.39 + for keymap in $(cat $stuff/keymaps-path.list) 1.40 + do 1.41 cp -a $install/usr/share/kbd/keymaps/i386/$keymap \ 1.42 $fs/usr/share/kbd/keymaps/i386/$keymap 1.43 - done 1.44 + done 1.45 1.46 # Include files 1.47 cp -a $install/usr/share/kbd/keymaps/include \ 1.48 - $fs/usr/share/kbd/keymaps 1.49 + $fs/usr/share/kbd/keymaps 1.50 cp -a $install/usr/share/kbd/keymaps/i386/include \ 1.51 - $fs/usr/share/kbd/keymaps/i386/include 1.52 + $fs/usr/share/kbd/keymaps/i386/include 1.53 1.54 # X11 keyboard aliases 1.55 - while read X keymap ; do 1.56 + while read X keymap 1.57 + do 1.58 ln -s $keymap.map.gz $fs/usr/share/kbd/keymaps/i386/$X.map.gz 1.59 - done <<EOT 1.60 + done <<EOT 1.61 qwertz/hr croat 1.62 EOT 1.63 }
2.1 --- a/kbd-busybox/receipt Sat Feb 29 16:45:43 2020 +0100 2.2 +++ b/kbd-busybox/receipt Sat Feb 29 17:01:43 2020 +0100 2.3 @@ -1,29 +1,30 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="kbd-busybox" 2.7 -VERSION="2.0.4" 2.8 +VERSION="2.2.0" 2.9 CATEGORY="base-system" 2.10 SHORT_DESC="Keyboard mapping definitions for busybox." 2.11 MAINTAINER="pascal.bellard@slitaz.org" 2.12 LICENSE="GPL2" 2.13 WEB_SITE="http://www.slitaz.org/" 2.14 2.15 +BUILD_DEPENDS="kbd-base busybox" 2.16 WANTED="kbd-base" # for VERSION check only 2.17 -BUILD_DEPENDS="kbd-base busybox" 2.18 2.19 # Rules to configure and make the package. 2.20 compile_rules() 2.21 { 2.22 mkdir -p $install/usr/share/kmap 2.23 dumpkmap > current.kmap || return 1 2.24 - for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do 2.25 + for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz) 2.26 + do 2.27 [ "$(dirname $i)" = "include" ] && continue 2.28 k=$(basename $i) 2.29 k=${k%.map.gz} 2.30 loadkeys -u /usr/share/kbd/keymaps/i386/$i && 2.31 dumpkmap > $install/usr/share/kmap/$k.kmap 2.32 dumpkmap | cmp current.kmap - > /dev/null && map=$i 2.33 - done 2.34 + done 2.35 loadkmap < current.kmap || loadkeys /usr/share/kbd/keymaps/i386/$map 2.36 } 2.37
3.1 --- a/kbd-vlock/receipt Sat Feb 29 16:45:43 2020 +0100 3.2 +++ b/kbd-vlock/receipt Sat Feb 29 17:01:43 2020 +0100 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="kbd-vlock" 3.7 -VERSION="2.0.4" 3.8 +VERSION="2.2.0" 3.9 CATEGORY="system-tools" 3.10 TAGS="console" 3.11 SHORT_DESC="Vlock - Virtual Console lock program." 3.12 @@ -9,12 +9,12 @@ 3.13 LICENSE="GPL2" 3.14 WEB_SITE="http://kbd-project.org/" 3.15 3.16 +DEPENDS="pam" 3.17 WANTED="kbd" 3.18 -DEPENDS="pam" 3.19 3.20 # Rules to gen a SliTaz package suitable for Tazpkg. 3.21 genpkg_rules() 3.22 { 3.23 mkdir -p $fs/usr/bin 3.24 - cp -a $install/usr/bin/vlock $fs/usr/bin 3.25 + cp -a $install/usr/bin/vlock $fs/usr/bin 3.26 }
4.1 --- a/kbd/receipt Sat Feb 29 16:45:43 2020 +0100 4.2 +++ b/kbd/receipt Sat Feb 29 17:01:43 2020 +0100 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="kbd" 4.7 -VERSION="2.0.4" 4.8 +VERSION="2.2.0" 4.9 CATEGORY="system-tools" 4.10 TAGS="keyboard" 4.11 SHORT_DESC="Keyboard mapping definitions and tools." 4.12 @@ -14,6 +14,7 @@ 4.13 4.14 DEPENDS="kbd-base" 4.15 BUILD_DEPENDS="advancecomp check-dev flex pam-dev" 4.16 + 4.17 HOST_ARCH="i486 arm" 4.18 4.19 # Handle cross compilation. 4.20 @@ -25,7 +26,8 @@ 4.21 compile_rules() 4.22 { 4.23 # standard locale placement 4.24 - sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in 4.25 + sed -i 's|localedir = .*|localedir = @localedir@|' \ 4.26 + po/Makefile.in.in 4.27 4.28 # Handle cross compilation. 4.29 case "$ARCH" in 4.30 @@ -42,7 +44,6 @@ 4.31 --localedir=/usr/share/locale \ 4.32 $CONFIGURE_ARGS ;; 4.33 esac && 4.34 - 4.35 make -j 1 && 4.36 make install && 4.37 4.38 @@ -56,20 +57,21 @@ 4.39 mkdir -p $fs/usr/share 4.40 4.41 # Copy all kbd files (should we split fonts?) 4.42 - cp -a $install/usr/share/kbd $fs/usr/share 4.43 + cp -a $install/usr/share/kbd $fs/usr/share 4.44 4.45 # Tools 4.46 - cp -a $install/usr/bin $fs/usr 4.47 + cp -a $install/usr/bin $fs/usr 4.48 4.49 # Remove files provided by kbd-base and kbd-vlock. 4.50 - for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list); do 4.51 + for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list) 4.52 + do 4.53 rm -f $fs/usr/share/kbd/keymaps/i386/$keymap 4.54 - done 4.55 - rm -rf $fs/usr/share/kbd/keymaps/include 4.56 - rm -rf $fs/usr/share/kbd/keymaps/i386/include 4.57 - rm -f $fs/usr/bin/loadkeys 4.58 - rm -f $fs/usr/bin/setfont 4.59 - rm -f $fs/usr/bin/vlock 4.60 + done 4.61 + rm -rf $fs/usr/share/kbd/keymaps/include 4.62 + rm -rf $fs/usr/share/kbd/keymaps/i386/include 4.63 + rm -f $fs/usr/bin/loadkeys 4.64 + rm -f $fs/usr/bin/setfont 4.65 + rm -f $fs/usr/bin/vlock 4.66 } 4.67 4.68 # Overlap busybox