# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1582992103 -3600
# Node ID 620819a54fad690af28bb47227e4770ebf5cec8d
# Parent  78937c4bff2e67cef26312f248c4115152edddeb
updated kbd, kbd-base, kbd-busybox and kbd-vlock (2.0.4 -> 2.2.0)

diff -r 78937c4bff2e -r 620819a54fad kbd-base/receipt
--- a/kbd-base/receipt	Sat Feb 29 16:45:43 2020 +0100
+++ b/kbd-base/receipt	Sat Feb 29 17:01:43 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-base"
-VERSION="2.0.4"
+VERSION="2.2.0"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities."
 MAINTAINER="pankso@slitaz.org"
@@ -9,6 +9,7 @@
 WEB_SITE="http://kbd-project.org/"
 
 WANTED="kbd"
+
 HOST_ARCH="i486 arm"
 
 # Make sure it will run on host or no keyboard support...
@@ -22,29 +23,33 @@
 genpkg_rules()
 {
 	mkdir -p $fs/bin
-	cp -a $install/usr/bin/loadkeys $install/usr/bin/setfont $fs/bin
+	cp -a $install/usr/bin/loadkeys	$fs/bin
+	cp -a $install/usr/bin/setfont	$fs/bin
 
-	# Dirs
-	for dir in dvorak azerty qwerty qwertz; do
+	# Directories
+	for dir in dvorak azerty qwerty qwertz
+	  do
 		mkdir -p $fs/usr/share/kbd/keymaps/i386/$dir
-	done
+	  done
 
 	# i386 keymaps only.
-	for keymap in $(cat $stuff/keymaps-path.list); do
+	for keymap in $(cat $stuff/keymaps-path.list)
+	  do
 		cp -a $install/usr/share/kbd/keymaps/i386/$keymap \
 			$fs/usr/share/kbd/keymaps/i386/$keymap
-	done
+	  done
 
 	# Include files
 	cp -a $install/usr/share/kbd/keymaps/include \
-		$fs/usr/share/kbd/keymaps
+			$fs/usr/share/kbd/keymaps
 	cp -a $install/usr/share/kbd/keymaps/i386/include \
-		$fs/usr/share/kbd/keymaps/i386/include
+			$fs/usr/share/kbd/keymaps/i386/include
 
 	# X11 keyboard aliases
-	while read X keymap ; do
+	while read X keymap
+	  do
 		ln -s $keymap.map.gz $fs/usr/share/kbd/keymaps/i386/$X.map.gz
-	done <<EOT
+	  done <<EOT
 qwertz/hr	croat
 EOT
 }
diff -r 78937c4bff2e -r 620819a54fad kbd-busybox/receipt
--- a/kbd-busybox/receipt	Sat Feb 29 16:45:43 2020 +0100
+++ b/kbd-busybox/receipt	Sat Feb 29 17:01:43 2020 +0100
@@ -1,29 +1,30 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-busybox"
-VERSION="2.0.4"
+VERSION="2.2.0"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard mapping definitions for busybox."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.slitaz.org/"
 
+BUILD_DEPENDS="kbd-base busybox"
 WANTED="kbd-base"	# for VERSION check only
-BUILD_DEPENDS="kbd-base busybox"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	mkdir -p $install/usr/share/kmap
 	dumpkmap > current.kmap || return 1
-	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
+	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz)
+	  do
 		[ "$(dirname $i)" = "include" ] && continue
 		k=$(basename $i)
 		k=${k%.map.gz}
 		loadkeys -u /usr/share/kbd/keymaps/i386/$i && 
 		dumpkmap > $install/usr/share/kmap/$k.kmap
 		dumpkmap | cmp current.kmap - > /dev/null && map=$i
-	done
+	  done
 	loadkmap < current.kmap || loadkeys /usr/share/kbd/keymaps/i386/$map
 }
 
diff -r 78937c4bff2e -r 620819a54fad kbd-vlock/receipt
--- a/kbd-vlock/receipt	Sat Feb 29 16:45:43 2020 +0100
+++ b/kbd-vlock/receipt	Sat Feb 29 17:01:43 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-vlock"
-VERSION="2.0.4"
+VERSION="2.2.0"
 CATEGORY="system-tools"
 TAGS="console"
 SHORT_DESC="Vlock - Virtual Console lock program."
@@ -9,12 +9,12 @@
 LICENSE="GPL2"
 WEB_SITE="http://kbd-project.org/"
 
+DEPENDS="pam"
 WANTED="kbd"
-DEPENDS="pam"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/vlock $fs/usr/bin
+	cp -a $install/usr/bin/vlock	$fs/usr/bin
 }
diff -r 78937c4bff2e -r 620819a54fad kbd/receipt
--- a/kbd/receipt	Sat Feb 29 16:45:43 2020 +0100
+++ b/kbd/receipt	Sat Feb 29 17:01:43 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd"
-VERSION="2.0.4"
+VERSION="2.2.0"
 CATEGORY="system-tools"
 TAGS="keyboard"
 SHORT_DESC="Keyboard mapping definitions and tools."
@@ -14,6 +14,7 @@
 
 DEPENDS="kbd-base"
 BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
+
 HOST_ARCH="i486 arm"
 
 # Handle cross compilation.
@@ -25,7 +26,8 @@
 compile_rules()
 {
 	# standard locale placement
-	sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in
+	sed -i 's|localedir = .*|localedir = @localedir@|' \
+		po/Makefile.in.in
 
 	# Handle cross compilation.
 	case "$ARCH" in
@@ -42,7 +44,6 @@
 				--localedir=/usr/share/locale	\
 				$CONFIGURE_ARGS ;;
 	esac &&
-
 	make -j 1 &&
 	make install &&
 
@@ -56,20 +57,21 @@
 	mkdir -p $fs/usr/share
 
 	# Copy all kbd files (should we split fonts?)
-	cp -a $install/usr/share/kbd $fs/usr/share
+	cp -a $install/usr/share/kbd	$fs/usr/share
 
 	# Tools
-	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/bin		$fs/usr
 
 	# Remove files provided by kbd-base and kbd-vlock.
-	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list); do
+	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list)
+	  do
 		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
-	done
-	rm -rf $fs/usr/share/kbd/keymaps/include
-	rm -rf $fs/usr/share/kbd/keymaps/i386/include
-	rm -f $fs/usr/bin/loadkeys
-	rm -f $fs/usr/bin/setfont
-	rm -f $fs/usr/bin/vlock
+	  done
+	rm -rf				$fs/usr/share/kbd/keymaps/include
+	rm -rf				$fs/usr/share/kbd/keymaps/i386/include
+	rm -f				$fs/usr/bin/loadkeys
+	rm -f				$fs/usr/bin/setfont
+	rm -f				$fs/usr/bin/vlock
 }
 
 # Overlap busybox