# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1446584301 -3600
# Node ID c9e797b1bf361cdcc322b3521072caa45ea5213a
# Parent  48d2c4c7a227a319240d137b552e606a5ef5795d
Add keyboard, remove fr

diff -r 48d2c4c7a227 -r c9e797b1bf36 dropbear-without-zlib/receipt
--- a/dropbear-without-zlib/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/dropbear-without-zlib/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -11,7 +11,6 @@
 DEPENDS="libutil"
 [ -n "$TARGET" ] || TARGET="i486"
 BUILD_DEPENDS="dropbear uclibc-cross-compiler-$TARGET"
-SUGGESTED="sftp-server"
 WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
 WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
 CONFIG_FILES="/etc/dropbear /etc/daemons.conf /etc/rcS.conf"
diff -r 48d2c4c7a227 -r c9e797b1bf36 dropbear/receipt
--- a/dropbear/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/dropbear/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -10,7 +10,6 @@
 DEPENDS="libutil zlib"
 [ -n "$TARGET" ] || TARGET="i486"
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET zlib-dev"
-SUGGESTED="sftp-server"
 WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
 WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
 CONFIG_FILES="/etc/dropbear /etc/daemons.conf /etc/rcS.conf"
diff -r 48d2c4c7a227 -r c9e797b1bf36 fr/receipt
--- a/fr/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="fr"
-VERSION="1.0"
-CATEGORY="meta"
-SHORT_DESC="FR keyboard and locales"
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://tiny.slitaz.org/"
-DEPENDS="base-tiny"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/etc $stuff
-	cd $stuff
-	echo "Europe/Paris" > $DESTDIR/etc/TZ
-	cat > $DESTDIR/etc/locale.conf <<EOT
-LANG=fr_FR
-LC_ALL=fr_FR
-EOT
-	while read pkg file ; do
-		if [ ! -s $pkg*/fs$file ]; then
-			tazpkg get $pkg
-			tazpkg extract $pkg*.tazpkg
-		fi
-		mkdir -p $DESTDIR$(dirname $file)
-		mv $pkg*/fs$file $DESTDIR$(dirname $file) || return 1
-	done << EOT
-kbd-busybox	/usr/share/kmap/fr-latin1.kmap
-EOT
-	cd ..
-	rm -rf $stuff
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/. $fs/
-}
diff -r 48d2c4c7a227 -r c9e797b1bf36 hardware-ibm-6272/receipt
--- a/hardware-ibm-6272/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/hardware-ibm-6272/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -9,7 +9,7 @@
 WEB_SITE="http://www.slitaz.org/"
 
 DEPENDS="isapnptools module-cs89x0"
-SUGGESTED="module-usb-storage"
+SUGGESTED="module-serial module-lp module-floppy"
 
 # Post message when installing.
 post_install()
diff -r 48d2c4c7a227 -r c9e797b1bf36 keyboard/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/keyboard/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -0,0 +1,142 @@
+# SliTaz package receipt.
+
+PACKAGE="keyboard"
+VERSION="1.0"
+CATEGORY="meta"
+SHORT_DESC="keyboard, locales and timezone settings"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="http://tiny.slitaz.org/"
+DEPENDS="base-tiny"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/usr/share $stuff
+	cd $stuff
+	tazpkg get kbd-busybox
+	tazpkg extract kbd-busybox*
+	mv kbd-busybox*/fs/usr/share/kmap $DESTDIR/usr/share
+	cd ..
+	rm -rf $stuff
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cp -a $install/. $fs/
+}
+
+config_form()
+{
+	cat <<EOT
+<script type="text/javascript">
+	
+var locale = [], timezone = [];
+function setdefault(kbd)
+{
+	if (locale[kbd] != 'undefined') {
+		document.getElementById("locale").value = locale[kbd];
+	}
+	if (timezone[kbd] != 'undefined') {
+		document.getElementById("timezone").value = timezone[kbd];
+	}
+}
+
+EOT
+	awk 'BEGIN { n=0 }
+{
+	print "locale[\"" $1 "\"] = \"" $2 "\";"
+	if ($3 != "-") print "timezone[\"" $1 "\"] = \"" $3 "\";"
+	gsub("_"," ",$4)
+	name[n] = $4
+	kbd[n++] = $1
+}
+END {
+	print "</script>"
+	print "<table>"
+	print "<tr><td>Keyboard</td>"
+	print "<td><select name=\"KEYBOARD\" onChange=\"setdefault(value)\">"
+	for (i=0; i < n; i++)
+		print "	<option value=\"" kbd[i] "\">" name[i] "</option>"
+}' <<EOT | sed "s|value=\"$KEYBOARD\"|& selected=\"selected\"|"
+br-abnt2	pt_BR	America/Sao_Paulo	Brasil_(abnt2)
+us-acentos	pt_BR	America/Sao_Paulo	Brasil_(us-acentos)
+cz-lat2		cs_CZ	Europe/Prague		Cesky
+dk-latin1	da_DK	Europe/Copenhagen	Danso
+de-latin1	de_DE	Europe/Berlin		Deutsch
+de_CH-latin1	de_CH	Europe/Zurich		Deutsch_Schweiz
+sg-latin1	de_CH	Europe/Zurich		Deutsch_Schweiz_(sg)
+uk		en_GB	Europe/London		English_UK
+us		en_US	America/New_York	English_US
+us-acentos	en_US	America/New_York	English_US_(acentos)
+dvorak		en_US	America/New_York	English_US_(dvorak)
+dvorak-l	en_US	America/New_York	English_US_(dvorak-l)
+dvorak-r	en_US	America/New_York	English_US_(dvorak-r)
+es		es_ES	Europe/Madrid		Espanol
+fr-latin1	fr_FR	Europe/Paris		Francais
+be-latin1	fr_BE	Europe/Brussels		Francais_Belgique
+cf		fr_CA	America/Montreal	Francais_Canada
+fr_CH-latin1	fr_CH	Europe/Zurich		Francais_Suisse
+croat		hr_HR	Europe/Zagreb		Hrvatski
+is-latin1	is_IS	Atlantic/Reykjavik	Islenska
+it		it_IT	Europe/Rome		Italiano
+jp106		ja_JP	Asia/Tokyo		Japanese
+hu		hu_HU	Europe/Budapest		Magyar
+nl2		nl_NL	Europe/Amsterdam	Nederlands
+no-latin1	nb_NO	Europe/Oslo		Norsk_(Bokmal)
+no-latin1	nn_NO	Europe/Oslo		Norsk_(Nynorsk)
+pl2		pl_PL	Europe/Warsaw		Polski
+pt-latin1	pt_PT	Europe/Lisbon		Portugues
+ru		ru_RU	Europe/Moscow		Russian
+slovene		sl_SI	Europe/Ljubljan		Slovenski
+fi-latin1	fi_FI	Europe/Helsinki		Suomi
+se-lat6		sv_SE	Europe/Stockholm	Svenska
+trq		tr_TR	Asia/Istanbul		Turkce
+tr_q-latin5	tr_TR	Asia/Istanbul		Turkce_(latin5)
+EOT
+	cat <<EOT
+</select></td>
+</tr>
+<tr>
+<td>Locale</td>
+<td><select name="LOCALE" id="locale">
+EOT
+	( cd /usr/share/i18n/locales ; ls ??_* ) | \
+	sed "s|.*|	<option>&</option>|;s|>$LOCALE<| selected=\"selected\"&|"
+	cat <<EOT
+</select></td>
+</tr>
+<tr>
+<td>Timezone</td>
+<td><select name="TIMEZONE" id="timezone">
+EOT
+	( cd /usr/share/zoneinfo ; find */ -type f ) | \
+	sed "s|.*|	<option>&</option>|;s|>$TIMEZONE<| selected=\"selected\"&|"
+	cat <<EOT
+</select></td>
+</tr>
+</table>
+EOT
+}
+
+post_install()
+{
+	for i in $1/usr/share/kmap/*.kmap ; do
+		[ $i == $1/usr/share/kmap/$KEYBOARD.kmap ] || rm $i
+	done
+	if [ -n "$LOCALE" ]; then
+		mkdir -p $1/usr/share/i18n/locales $1/etc
+		cat > $1/etc/locale.conf <<EOT
+LANG=$LOCALE
+LC_ALL=$LOCALE
+EOT
+		cp /usr/share/i18n/locales/$LOCALE $1/usr/share/i18n/locales
+	fi
+	if [ -n "$TIMEZONE" ]; then
+		mkdir -p $1/usr/share/zoneinfo $1/etc
+		echo "$TIMEZONE" > $1/etc/TZ
+		( cd /usr/share/zoneinfo; echo $TIMEZONE | cpio -o -H newc ) | \
+		( cd $1/usr/share/zoneinfo ; cpio -id )
+	fi
+}
diff -r 48d2c4c7a227 -r c9e797b1bf36 module-3c509/receipt
--- a/module-3c509/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/module-3c509/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -3,7 +3,7 @@
 PACKAGE="module-3c509"
 VERSION="2.6.14"
 CATEGORY="base-system"
-SHORT_DESC="Kernel module for the 3c509 driver"
+SHORT_DESC="Kernel module for the 3c509 (3com Etherlink III) driver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://tiny.slitaz.org/"
diff -r 48d2c4c7a227 -r c9e797b1bf36 module-floppy/receipt
--- a/module-floppy/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/module-floppy/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WEB_SITE="http://tiny.slitaz.org/"
 WANTED="linux"
+SUGGESTED="module-ext3 module-fat"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 48d2c4c7a227 -r c9e797b1bf36 module-hfsplus/receipt
--- a/module-hfsplus/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/module-hfsplus/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -3,7 +3,7 @@
 PACKAGE="module-hfsplus"
 VERSION="2.6.14"
 CATEGORY="base-system"
-SHORT_DESC="Kernel module for the hfsplus filesystem"
+SHORT_DESC="Kernel module for the hfsplus (MacOS) filesystem"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://tiny.slitaz.org/"
diff -r 48d2c4c7a227 -r c9e797b1bf36 module-serial/receipt
--- a/module-serial/receipt	Sat Oct 31 16:32:19 2015 +0100
+++ b/module-serial/receipt	Tue Nov 03 21:58:21 2015 +0100
@@ -3,7 +3,7 @@
 PACKAGE="module-serial"
 VERSION="2.6.14"
 CATEGORY="base-system"
-SHORT_DESC="Kernel module for the serial port"
+SHORT_DESC="Kernel module for the serial (RS232) port"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://tiny.slitaz.org/"