wok rev 18168
syslinux: change some locales in the menu; update locale-* package set according to syslinux menu, add kbd (console keyboard) layouts.
line diff
1.1 --- a/locale-ar/receipt Sun Jun 28 14:56:44 2015 +0300 1.2 +++ b/locale-ar/receipt Sun Jun 28 15:14:56 2015 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt 1.5 1.6 PACKAGE="locale-ar" 1.7 -VERSION="4.2" 1.8 +VERSION="5.0" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="Arabic locale pack" 1.11 MAINTAINER="al.bobylev@gmail.com" 1.12 @@ -9,7 +9,7 @@ 1.13 WEB_SITE="http://www.slitaz.org/" 1.14 HOST_ARCH="i486 arm" 1.15 1.16 -WANTED="glibc slitaz-i18n xorg-libX11" 1.17 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata" 1.18 DEPENDS="glibc-base" 1.19 1.20 LOCALE="ar"
2.1 --- a/locale-cs/receipt Sun Jun 28 14:56:44 2015 +0300 2.2 +++ b/locale-cs/receipt Sun Jun 28 15:14:56 2015 +0300 2.3 @@ -1,20 +1,21 @@ 2.4 # SliTaz package receipt 2.5 2.6 PACKAGE="locale-cs" 2.7 -VERSION="4.2" 2.8 +VERSION="5.0" 2.9 CATEGORY="system-tools" 2.10 -SHORT_DESC="Czech locale pack." 2.11 +SHORT_DESC="Czech locale pack" 2.12 MAINTAINER="pankso@slitaz.org" 2.13 LICENSE="GPL3" 2.14 WEB_SITE="http://www.slitaz.org/" 2.15 HOST_ARCH="i486 arm" 2.16 2.17 -WANTED="glibc slitaz-i18n xorg-libX11" 2.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 2.19 DEPENDS="glibc-base" 2.20 2.21 LOCALE="cs" 2.22 LOCALE_DEPENDS="" 2.23 -KB_FLAGS="" 2.24 +KBD="cz-lat2" 2.25 +KB_FLAGS="CZ:cz" 2.26 GCONV="ISO8859-2 IBM852 CP1250" 2.27 2.28 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- a/locale-da/receipt Sun Jun 28 14:56:44 2015 +0300 3.2 +++ b/locale-da/receipt Sun Jun 28 15:14:56 2015 +0300 3.3 @@ -1,21 +1,22 @@ 3.4 # SliTaz package receipt 3.5 3.6 PACKAGE="locale-da" 3.7 -VERSION="4.2" 3.8 +VERSION="5.0" 3.9 CATEGORY="system-tools" 3.10 -SHORT_DESC="Danish locale pack." 3.11 +SHORT_DESC="Danish locale pack" 3.12 MAINTAINER="pankso@slitaz.org" 3.13 LICENSE="GPL3" 3.14 WEB_SITE="http://www.slitaz.org/" 3.15 HOST_ARCH="i486 arm" 3.16 3.17 -WANTED="glibc slitaz-i18n xorg-libX11" 3.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 3.19 DEPENDS="glibc-base" 3.20 3.21 LOCALE="da" 3.22 LOCALE_DEPENDS="" 3.23 -KB_FLAGS="" 3.24 -GCONV="IBM865" 3.25 +KBD="dk-latin1" 3.26 +KB_FLAGS="DK:dk" 3.27 +GCONV="IBM865 ISO8859-1 ISO8859-15" 3.28 3.29 # Rules to gen a SliTaz package suitable for Tazpkg. 3.30 genpkg_rules()
4.1 --- a/locale-de/receipt Sun Jun 28 14:56:44 2015 +0300 4.2 +++ b/locale-de/receipt Sun Jun 28 15:14:56 2015 +0300 4.3 @@ -1,21 +1,22 @@ 4.4 # SliTaz package receipt 4.5 4.6 PACKAGE="locale-de" 4.7 -VERSION="4.2" 4.8 +VERSION="5.0" 4.9 CATEGORY="system-tools" 4.10 -SHORT_DESC="German locale pack." 4.11 +SHORT_DESC="German locale pack" 4.12 MAINTAINER="pankso@slitaz.org" 4.13 LICENSE="GPL3" 4.14 WEB_SITE="http://www.slitaz.org/" 4.15 HOST_ARCH="i486 arm" 4.16 4.17 -WANTED="glibc slitaz-i18n xorg-libX11" 4.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 4.19 DEPENDS="glibc-base" 4.20 4.21 LOCALE="de" 4.22 LOCALE_DEPENDS="fr_BE" # for de_BE 4.23 -KB_FLAGS="" 4.24 -GCONV="" 4.25 +KBD="de-latin1 de_CH-latin1 sg-latin1" 4.26 +KB_FLAGS="DE:de AT:at CH:ch" 4.27 +GCONV="ISO8859-1 ISO8859-15" 4.28 4.29 # Rules to gen a SliTaz package suitable for Tazpkg. 4.30 genpkg_rules()
5.1 --- a/locale-el/receipt Sun Jun 28 14:56:44 2015 +0300 5.2 +++ b/locale-el/receipt Sun Jun 28 15:14:56 2015 +0300 5.3 @@ -9,13 +9,14 @@ 5.4 WEB_SITE="http://www.slitaz.org/" 5.5 HOST_ARCH="i486 arm" 5.6 5.7 -WANTED="glibc slitaz-i18n xorg-libX11" 5.8 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 5.9 DEPENDS="glibc-base" 5.10 5.11 LOCALE="el" 5.12 LOCALE_DEPENDS="" 5.13 +KBD="gr" 5.14 KB_FLAGS="GR:gr US:us" 5.15 -GCONV="ISO8859-7 IBM869 CP1253" 5.16 +GCONV="ISO8859-7 IBM869 CP1253 ISO8859-15" 5.17 5.18 # Rules to gen a SliTaz package suitable for Tazpkg. 5.19 genpkg_rules()
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/locale-en/receipt Sun Jun 28 15:14:56 2015 +0300 6.3 @@ -0,0 +1,33 @@ 6.4 +# SliTaz package receipt 6.5 + 6.6 +PACKAGE="locale-en" 6.7 +VERSION="5.0" 6.8 +CATEGORY="system-tools" 6.9 +SHORT_DESC="English locale pack" 6.10 +MAINTAINER="al.bobylev@gmail.com" 6.11 +LICENSE="GPL3" 6.12 +WEB_SITE="http://www.slitaz.org/" 6.13 +HOST_ARCH="i486 arm" 6.14 + 6.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 6.16 +DEPENDS="glibc-base" 6.17 + 6.18 +LOCALE="en" 6.19 +LOCALE_DEPENDS="" 6.20 +KBD="uk us us-acentos dvorak dvorak-l dvorak-r" 6.21 +KB_FLAGS="CM:cm GH:gh NG:ng ZA:za GB:gb US:us" 6.22 +GCONV="ISO8859-1 ISO8859-15" 6.23 + 6.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 6.25 +genpkg_rules() 6.26 +{ 6.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 6.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 6.29 + get_locale 6.30 +} 6.31 + 6.32 +# Back to C if it's the last used locale. 6.33 +post_remove() 6.34 +{ 6.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 6.36 +}
7.1 --- a/locale-es/receipt Sun Jun 28 14:56:44 2015 +0300 7.2 +++ b/locale-es/receipt Sun Jun 28 15:14:56 2015 +0300 7.3 @@ -1,21 +1,22 @@ 7.4 # SliTaz package receipt 7.5 7.6 PACKAGE="locale-es" 7.7 -VERSION="4.2" 7.8 +VERSION="5.0" 7.9 CATEGORY="system-tools" 7.10 -SHORT_DESC="Spanish locale pack." 7.11 +SHORT_DESC="Spanish locale pack" 7.12 MAINTAINER="pankso@slitaz.org" 7.13 LICENSE="GPL3" 7.14 WEB_SITE="http://www.slitaz.org/" 7.15 HOST_ARCH="i486 arm" 7.16 7.17 -WANTED="glibc slitaz-i18n xorg-libX11" 7.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 7.19 DEPENDS="glibc-base" 7.20 7.21 LOCALE="es" 7.22 LOCALE_DEPENDS="" 7.23 -KB_FLAGS="" 7.24 -GCONV="" 7.25 +KBD="es" 7.26 +KB_FLAGS="ES:es ES:latam" 7.27 +GCONV="ISO8859-1 ISO8859-15" 7.28 7.29 # Rules to gen a SliTaz package suitable for Tazpkg. 7.30 genpkg_rules()
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/locale-fi/receipt Sun Jun 28 15:14:56 2015 +0300 8.3 @@ -0,0 +1,33 @@ 8.4 +# SliTaz package receipt 8.5 + 8.6 +PACKAGE="locale-fi" 8.7 +VERSION="5.0" 8.8 +CATEGORY="system-tools" 8.9 +SHORT_DESC="Finnish locale pack" 8.10 +MAINTAINER="al.bobylev@gmail.com" 8.11 +LICENSE="GPL3" 8.12 +WEB_SITE="http://www.slitaz.org/" 8.13 +HOST_ARCH="i486 arm" 8.14 + 8.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 8.16 +DEPENDS="glibc-base" 8.17 + 8.18 +LOCALE="fi" 8.19 +LOCALE_DEPENDS="" 8.20 +KBD="fi" 8.21 +KB_FLAGS="FI:fi" 8.22 +GCONV="ISO8859-1 ISO8859-15" 8.23 + 8.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 8.25 +genpkg_rules() 8.26 +{ 8.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 8.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 8.29 + get_locale 8.30 +} 8.31 + 8.32 +# Back to C if it's the last used locale. 8.33 +post_remove() 8.34 +{ 8.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 8.36 +}
9.1 --- a/locale-fr/receipt Sun Jun 28 14:56:44 2015 +0300 9.2 +++ b/locale-fr/receipt Sun Jun 28 15:14:56 2015 +0300 9.3 @@ -1,21 +1,22 @@ 9.4 # SliTaz package receipt 9.5 9.6 PACKAGE="locale-fr" 9.7 -VERSION="4.2" 9.8 +VERSION="5.0" 9.9 CATEGORY="system-tools" 9.10 -SHORT_DESC="French locale pack." 9.11 +SHORT_DESC="French locale pack" 9.12 MAINTAINER="pankso@slitaz.org" 9.13 LICENSE="GPL3" 9.14 WEB_SITE="http://www.slitaz.org/" 9.15 HOST_ARCH="i486 arm" 9.16 9.17 -WANTED="glibc slitaz-i18n xorg-libX11" 9.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 9.19 DEPENDS="glibc-base" 9.20 9.21 LOCALE="fr" 9.22 LOCALE_DEPENDS="en_CA de_CH" # for fr_CA and fr_CH 9.23 -KB_FLAGS="" 9.24 -GCONV="" 9.25 +KBD="fr-latin1 be-latin1 cf fr_CH-latin1" 9.26 +KB_FLAGS="FR:fr CA:ca CD:cd GN:gn" 9.27 +GCONV="ISO8859-1 ISO8859-15" 9.28 9.29 # Rules to gen a SliTaz package suitable for Tazpkg. 9.30 genpkg_rules()
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/locale-hr/receipt Sun Jun 28 15:14:56 2015 +0300 10.3 @@ -0,0 +1,33 @@ 10.4 +# SliTaz package receipt 10.5 + 10.6 +PACKAGE="locale-hr" 10.7 +VERSION="5.0" 10.8 +CATEGORY="system-tools" 10.9 +SHORT_DESC="Croatian locale pack" 10.10 +MAINTAINER="al.bobylev@gmail.com" 10.11 +LICENSE="GPL3" 10.12 +WEB_SITE="http://www.slitaz.org/" 10.13 +HOST_ARCH="i486 arm" 10.14 + 10.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 10.16 +DEPENDS="glibc-base" 10.17 + 10.18 +LOCALE="hr" 10.19 +LOCALE_DEPENDS="" 10.20 +KBD="croat" 10.21 +KB_FLAGS="HR:hr" 10.22 +GCONV="ISO8859-2" 10.23 + 10.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 10.25 +genpkg_rules() 10.26 +{ 10.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 10.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 10.29 + get_locale 10.30 +} 10.31 + 10.32 +# Back to C if it's the last used locale. 10.33 +post_remove() 10.34 +{ 10.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 10.36 +}
11.1 --- a/locale-hu/receipt Sun Jun 28 14:56:44 2015 +0300 11.2 +++ b/locale-hu/receipt Sun Jun 28 15:14:56 2015 +0300 11.3 @@ -1,20 +1,21 @@ 11.4 # SliTaz package receipt 11.5 11.6 PACKAGE="locale-hu" 11.7 -VERSION="4.2" 11.8 +VERSION="5.0" 11.9 CATEGORY="system-tools" 11.10 -SHORT_DESC="Hungarian locale pack." 11.11 +SHORT_DESC="Hungarian locale pack" 11.12 MAINTAINER="pankso@slitaz.org" 11.13 LICENSE="GPL3" 11.14 WEB_SITE="http://www.slitaz.org/" 11.15 HOST_ARCH="i486 arm" 11.16 11.17 -WANTED="glibc slitaz-i18n xorg-libX11" 11.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 11.19 DEPENDS="glibc-base" 11.20 11.21 LOCALE="hu" 11.22 LOCALE_DEPENDS="" 11.23 -KB_FLAGS="" 11.24 +KBD="hu" 11.25 +KB_FLAGS="HU:hu" 11.26 GCONV="ISO8859-2 IBM852 CP1250" 11.27 11.28 # Rules to gen a SliTaz package suitable for Tazpkg.
12.1 --- a/locale-id/receipt Sun Jun 28 14:56:44 2015 +0300 12.2 +++ b/locale-id/receipt Sun Jun 28 15:14:56 2015 +0300 12.3 @@ -1,21 +1,22 @@ 12.4 # SliTaz package receipt 12.5 12.6 PACKAGE="locale-id" 12.7 -VERSION="4.2" 12.8 +VERSION="5.0" 12.9 CATEGORY="system-tools" 12.10 -SHORT_DESC="Indonesian locale pack." 12.11 +SHORT_DESC="Indonesian locale pack" 12.12 MAINTAINER="pankso@slitaz.org" 12.13 LICENSE="GPL3" 12.14 WEB_SITE="http://www.slitaz.org/" 12.15 HOST_ARCH="i486 arm" 12.16 12.17 -WANTED="glibc slitaz-i18n xorg-libX11" 12.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata" 12.19 DEPENDS="glibc-base" 12.20 12.21 LOCALE="id" 12.22 LOCALE_DEPENDS="" 12.23 +KBD="" 12.24 KB_FLAGS="" 12.25 -GCONV="" 12.26 +GCONV="ISO8859-1 ISO8859-15" 12.27 12.28 # Rules to gen a SliTaz package suitable for Tazpkg. 12.29 genpkg_rules()
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/locale-is/receipt Sun Jun 28 15:14:56 2015 +0300 13.3 @@ -0,0 +1,33 @@ 13.4 +# SliTaz package receipt 13.5 + 13.6 +PACKAGE="locale-is" 13.7 +VERSION="5.0" 13.8 +CATEGORY="system-tools" 13.9 +SHORT_DESC="Icelandic locale pack" 13.10 +MAINTAINER="al.bobylev@gmail.com" 13.11 +LICENSE="GPL3" 13.12 +WEB_SITE="http://www.slitaz.org/" 13.13 +HOST_ARCH="i486 arm" 13.14 + 13.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 13.16 +DEPENDS="glibc-base" 13.17 + 13.18 +LOCALE="is" 13.19 +LOCALE_DEPENDS="" 13.20 +KBD="is-latin1" 13.21 +KB_FLAGS="IS:is" 13.22 +GCONV="ISO8859-1 ISO8859-15" 13.23 + 13.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 13.25 +genpkg_rules() 13.26 +{ 13.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 13.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 13.29 + get_locale 13.30 +} 13.31 + 13.32 +# Back to C if it's the last used locale. 13.33 +post_remove() 13.34 +{ 13.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 13.36 +}
14.1 --- a/locale-it/receipt Sun Jun 28 14:56:44 2015 +0300 14.2 +++ b/locale-it/receipt Sun Jun 28 15:14:56 2015 +0300 14.3 @@ -1,21 +1,22 @@ 14.4 # SliTaz package receipt 14.5 14.6 PACKAGE="locale-it" 14.7 -VERSION="4.2" 14.8 +VERSION="5.0" 14.9 CATEGORY="system-tools" 14.10 -SHORT_DESC="Italian locale pack." 14.11 +SHORT_DESC="Italian locale pack" 14.12 MAINTAINER="pankso@slitaz.org" 14.13 LICENSE="GPL3" 14.14 WEB_SITE="http://www.slitaz.org/" 14.15 HOST_ARCH="i486 arm" 14.16 14.17 -WANTED="glibc slitaz-i18n xorg-libX11" 14.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 14.19 DEPENDS="glibc-base" 14.20 14.21 LOCALE="it" 14.22 LOCALE_DEPENDS="de_CH" # for it_CH 14.23 -KB_FLAGS="" 14.24 -GCONV="" 14.25 +KBD="it" 14.26 +KB_FLAGS="IT:it" 14.27 +GCONV="ISO8859-1 ISO8859-15" 14.28 14.29 # Rules to gen a SliTaz package suitable for Tazpkg. 14.30 genpkg_rules()
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/locale-ja/receipt Sun Jun 28 15:14:56 2015 +0300 15.3 @@ -0,0 +1,33 @@ 15.4 +# SliTaz package receipt 15.5 + 15.6 +PACKAGE="locale-ja" 15.7 +VERSION="5.0" 15.8 +CATEGORY="system-tools" 15.9 +SHORT_DESC="Japanese locale pack" 15.10 +MAINTAINER="al.bobylev@gmail.com" 15.11 +LICENSE="GPL3" 15.12 +WEB_SITE="http://www.slitaz.org/" 15.13 +HOST_ARCH="i486 arm" 15.14 + 15.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 15.16 +DEPENDS="glibc-base" 15.17 + 15.18 +LOCALE="ja" 15.19 +LOCALE_DEPENDS="translit_cjk_variants" 15.20 +KBD="jp106" 15.21 +KB_FLAGS="JP:jp US:us" 15.22 +GCONV="EUC-JP EUC-JP-MS SJIS libJIS" 15.23 + 15.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 15.25 +genpkg_rules() 15.26 +{ 15.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 15.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 15.29 + get_locale 15.30 +} 15.31 + 15.32 +# Back to C if it's the last used locale. 15.33 +post_remove() 15.34 +{ 15.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 15.36 +}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/locale-nb/receipt Sun Jun 28 15:14:56 2015 +0300 16.3 @@ -0,0 +1,33 @@ 16.4 +# SliTaz package receipt 16.5 + 16.6 +PACKAGE="locale-nb" 16.7 +VERSION="5.0" 16.8 +CATEGORY="system-tools" 16.9 +SHORT_DESC="Norwegian locale pack (Bokmål)" 16.10 +MAINTAINER="al.bobylev@gmail.com" 16.11 +LICENSE="GPL3" 16.12 +WEB_SITE="http://www.slitaz.org/" 16.13 +HOST_ARCH="i486 arm" 16.14 + 16.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 16.16 +DEPENDS="glibc-base" 16.17 + 16.18 +LOCALE="nb" 16.19 +LOCALE_DEPENDS="" 16.20 +KBD="no-latin1" 16.21 +KB_FLAGS="NO:no" 16.22 +GCONV="ISO8859-1 ISO8859-15" 16.23 + 16.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 16.25 +genpkg_rules() 16.26 +{ 16.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 16.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 16.29 + get_locale 16.30 +} 16.31 + 16.32 +# Back to C if it's the last used locale. 16.33 +post_remove() 16.34 +{ 16.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 16.36 +}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/locale-nl/receipt Sun Jun 28 15:14:56 2015 +0300 17.3 @@ -0,0 +1,33 @@ 17.4 +# SliTaz package receipt 17.5 + 17.6 +PACKAGE="locale-nl" 17.7 +VERSION="5.0" 17.8 +CATEGORY="system-tools" 17.9 +SHORT_DESC="Dutch locale pack" 17.10 +MAINTAINER="al.bobylev@gmail.com" 17.11 +LICENSE="GPL3" 17.12 +WEB_SITE="http://www.slitaz.org/" 17.13 +HOST_ARCH="i486 arm" 17.14 + 17.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 17.16 +DEPENDS="glibc-base" 17.17 + 17.18 +LOCALE="nl" 17.19 +LOCALE_DEPENDS="" 17.20 +KBD="nl2" 17.21 +KB_FLAGS="NL:nl" 17.22 +GCONV="ISO8859-1 ISO8859-15" 17.23 + 17.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 17.25 +genpkg_rules() 17.26 +{ 17.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 17.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 17.29 + get_locale 17.30 +} 17.31 + 17.32 +# Back to C if it's the last used locale. 17.33 +post_remove() 17.34 +{ 17.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 17.36 +}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/locale-nn/receipt Sun Jun 28 15:14:56 2015 +0300 18.3 @@ -0,0 +1,33 @@ 18.4 +# SliTaz package receipt 18.5 + 18.6 +PACKAGE="locale-nn" 18.7 +VERSION="5.0" 18.8 +CATEGORY="system-tools" 18.9 +SHORT_DESC="Norwegian locale pack (Nynorsk)" 18.10 +MAINTAINER="al.bobylev@gmail.com" 18.11 +LICENSE="GPL3" 18.12 +WEB_SITE="http://www.slitaz.org/" 18.13 +HOST_ARCH="i486 arm" 18.14 + 18.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 18.16 +DEPENDS="glibc-base" 18.17 + 18.18 +LOCALE="nn" 18.19 +LOCALE_DEPENDS="" 18.20 +KBD="no-latin1" 18.21 +KB_FLAGS="NO:no" 18.22 +GCONV="ISO8859-1 ISO8859-15" 18.23 + 18.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 18.25 +genpkg_rules() 18.26 +{ 18.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 18.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 18.29 + get_locale 18.30 +} 18.31 + 18.32 +# Back to C if it's the last used locale. 18.33 +post_remove() 18.34 +{ 18.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 18.36 +}
19.1 --- a/locale-pl/receipt Sun Jun 28 14:56:44 2015 +0300 19.2 +++ b/locale-pl/receipt Sun Jun 28 15:14:56 2015 +0300 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt 19.5 19.6 PACKAGE="locale-pl" 19.7 -VERSION="4.2" 19.8 +VERSION="5.0" 19.9 CATEGORY="system-tools" 19.10 SHORT_DESC="Polish locale pack" 19.11 MAINTAINER="al.bobylev@gmail.com" 19.12 @@ -9,12 +9,13 @@ 19.13 WEB_SITE="http://www.slitaz.org/" 19.14 HOST_ARCH="i486 arm" 19.15 19.16 -WANTED="glibc slitaz-i18n xorg-libX11" 19.17 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 19.18 DEPENDS="glibc-base" 19.19 19.20 LOCALE="pl" 19.21 LOCALE_DEPENDS="" 19.22 -KB_FLAGS="" 19.23 +KBD="pl2" 19.24 +KB_FLAGS="PL:pl" 19.25 GCONV="ISO8859-2 IBM852 CP1250" 19.26 19.27 # Rules to gen a SliTaz package suitable for Tazpkg.
20.1 --- a/locale-pt/receipt Sun Jun 28 14:56:44 2015 +0300 20.2 +++ b/locale-pt/receipt Sun Jun 28 15:14:56 2015 +0300 20.3 @@ -1,22 +1,23 @@ 20.4 # SliTaz package receipt 20.5 20.6 PACKAGE="locale-pt" 20.7 -VERSION="4.2" 20.8 +VERSION="5.0" 20.9 CATEGORY="system-tools" 20.10 -SHORT_DESC="Portuguese locale pack." 20.11 +SHORT_DESC="Portuguese locale pack" 20.12 MAINTAINER="pankso@slitaz.org" 20.13 LICENSE="GPL3" 20.14 WEB_SITE="http://www.slitaz.org/" 20.15 HOST_ARCH="i486 arm" 20.16 20.17 -WANTED="glibc slitaz-i18n xorg-libX11" 20.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 20.19 DEPENDS="glibc-base" 20.20 20.21 LOCALE="pt" 20.22 LOCALE_DEPENDS="" 20.23 LOCALEDEF="pt_PT pt_PT@euro" 20.24 -KB_FLAGS="" 20.25 -GCONV="" 20.26 +KBD="pt-latin1" 20.27 +KB_FLAGS="PT:pt" 20.28 +GCONV="ISO8859-1 ISO8859-15" 20.29 20.30 # Rules to gen a SliTaz package suitable for Tazpkg. 20.31 genpkg_rules()
21.1 --- a/locale-pt_BR/receipt Sun Jun 28 14:56:44 2015 +0300 21.2 +++ b/locale-pt_BR/receipt Sun Jun 28 15:14:56 2015 +0300 21.3 @@ -1,9 +1,9 @@ 21.4 # SliTaz package receipt 21.5 21.6 PACKAGE="locale-pt_BR" 21.7 -VERSION="4.2" 21.8 +VERSION="5.0" 21.9 CATEGORY="system-tools" 21.10 -SHORT_DESC="Portuguese/Brazilian locale pack." 21.11 +SHORT_DESC="Portuguese/Brazilian locale pack" 21.12 MAINTAINER="pankso@slitaz.org" 21.13 LICENSE="GPL3" 21.14 WEB_SITE="http://www.slitaz.org/" 21.15 @@ -14,8 +14,9 @@ 21.16 21.17 LOCALE="pt_BR" 21.18 LOCALE_DEPENDS="pt_PT" # for pt_BR 21.19 -KB_FLAGS="" 21.20 -GCONV="" 21.21 +KBD="br-abnt2 us-acentos" 21.22 +KB_FLAGS="BR:br" 21.23 +GCONV="ISO8859-1 ISO8859-15" 21.24 21.25 # Rules to gen a SliTaz package suitable for Tazpkg. 21.26 genpkg_rules() 21.27 @@ -30,4 +31,3 @@ 21.28 { 21.29 echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 21.30 } 21.31 -
22.1 --- a/locale-ro/receipt Sun Jun 28 14:56:44 2015 +0300 22.2 +++ b/locale-ro/receipt Sun Jun 28 15:14:56 2015 +0300 22.3 @@ -1,7 +1,7 @@ 22.4 # SliTaz package receipt 22.5 22.6 PACKAGE="locale-ro" 22.7 -VERSION="4.2" 22.8 +VERSION="5.0" 22.9 CATEGORY="system-tools" 22.10 SHORT_DESC="Romanian locale pack" 22.11 MAINTAINER="al.bobylev@gmail.com" 22.12 @@ -9,11 +9,12 @@ 22.13 WEB_SITE="http://www.slitaz.org/" 22.14 HOST_ARCH="i486 arm" 22.15 22.16 -WANTED="glibc slitaz-i18n xorg-libX11" 22.17 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 22.18 DEPENDS="glibc-base" 22.19 22.20 LOCALE="ro" 22.21 LOCALE_DEPENDS="" 22.22 +KBD="ro ro_std ro_win" 22.23 KB_FLAGS="RO:ro" 22.24 GCONV="IBM852 CP1250 ISO8859-2 ISO8859-16" 22.25 22.26 @@ -23,14 +24,6 @@ 22.27 . $WOK/slitaz-i18n/stuff/locale-pack.functions 22.28 . $WOK/slitaz-i18n/stuff/locale-pack.conf 22.29 get_locale 22.30 - 22.31 - # Copy X11 Compose Rules 22.32 - mkdir -p $fs/usr/share/X11/locale 22.33 - cp -a $WOK/xorg-libX11/install/usr/share/X11/locale/iso8859-2 $fs/usr/share/X11/locale 22.34 - 22.35 - # Copy Kbd definitions 22.36 - mkdir -p $fs/usr/share/kbd/keymaps/i386/qwerty 22.37 - cp -a $WOK/kbd/install/usr/share/kbd/keymaps/i386/qwerty/ro* $fs/usr/share/kbd/keymaps/i386/qwerty 22.38 } 22.39 22.40 # Back to C if it's the last used locale.
23.1 --- a/locale-ru/receipt Sun Jun 28 14:56:44 2015 +0300 23.2 +++ b/locale-ru/receipt Sun Jun 28 15:14:56 2015 +0300 23.3 @@ -1,19 +1,20 @@ 23.4 # SliTaz package receipt 23.5 23.6 PACKAGE="locale-ru" 23.7 -VERSION="4.2" 23.8 +VERSION="5.0" 23.9 CATEGORY="system-tools" 23.10 -SHORT_DESC="Russian locale pack." 23.11 +SHORT_DESC="Russian locale pack" 23.12 MAINTAINER="pankso@slitaz.org" 23.13 LICENSE="GPL3" 23.14 WEB_SITE="http://www.slitaz.org/" 23.15 HOST_ARCH="i486 arm" 23.16 23.17 -WANTED="glibc slitaz-i18n xorg-libX11" 23.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 23.19 DEPENDS="glibc-base" 23.20 23.21 LOCALE="ru" 23.22 LOCALE_DEPENDS="" 23.23 +KBD="ru" 23.24 KB_FLAGS="US:us RU:ru UA:ua" 23.25 GCONV="ISO8859-5 KOI8-R KOI8-U IBM866 CP1251" 23.26
24.1 --- a/locale-sl/receipt Sun Jun 28 14:56:44 2015 +0300 24.2 +++ b/locale-sl/receipt Sun Jun 28 15:14:56 2015 +0300 24.3 @@ -1,20 +1,21 @@ 24.4 # SliTaz package receipt 24.5 24.6 PACKAGE="locale-sl" 24.7 -VERSION="4.2" 24.8 +VERSION="5.0" 24.9 CATEGORY="system-tools" 24.10 -SHORT_DESC="Slovenian locale pack." 24.11 +SHORT_DESC="Slovenian locale pack" 24.12 MAINTAINER="pankso@slitaz.org" 24.13 LICENSE="GPL3" 24.14 WEB_SITE="http://www.slitaz.org/" 24.15 HOST_ARCH="i486 arm" 24.16 24.17 -WANTED="glibc slitaz-i18n xorg-libX11" 24.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 24.19 DEPENDS="glibc-base" 24.20 24.21 LOCALE="sl" 24.22 LOCALE_DEPENDS="" 24.23 -KB_FLAGS="" 24.24 +KBD="slovene" 24.25 +KB_FLAGS="SI:si" 24.26 GCONV="ISO8859-2 IBM852 CP1250" 24.27 24.28 # Rules to gen a SliTaz package suitable for Tazpkg.
25.1 --- a/locale-sv/receipt Sun Jun 28 14:56:44 2015 +0300 25.2 +++ b/locale-sv/receipt Sun Jun 28 15:14:56 2015 +0300 25.3 @@ -1,21 +1,22 @@ 25.4 # SliTaz package receipt 25.5 25.6 PACKAGE="locale-sv" 25.7 -VERSION="4.2" 25.8 +VERSION="5.0" 25.9 CATEGORY="system-tools" 25.10 -SHORT_DESC="Swedish locale pack." 25.11 +SHORT_DESC="Swedish locale pack" 25.12 MAINTAINER="pankso@slitaz.org" 25.13 LICENSE="GPL3" 25.14 WEB_SITE="http://www.slitaz.org/" 25.15 HOST_ARCH="i486 arm" 25.16 25.17 -WANTED="glibc slitaz-i18n xorg-libX11" 25.18 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 25.19 DEPENDS="glibc-base" 25.20 25.21 LOCALE="sv" 25.22 LOCALE_DEPENDS="fi_FI fi_FI@euro" # for sv_FI and sv_FI@euro 25.23 -KB_FLAGS="" 25.24 -GCONV="" 25.25 +KBD="se-lat6" 25.26 +KB_FLAGS="SE:se" 25.27 +GCONV="ISO8859-1 ISO8859-15" 25.28 25.29 # Rules to gen a SliTaz package suitable for Tazpkg. 25.30 genpkg_rules()
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/locale-tr/receipt Sun Jun 28 15:14:56 2015 +0300 26.3 @@ -0,0 +1,33 @@ 26.4 +# SliTaz package receipt 26.5 + 26.6 +PACKAGE="locale-tr" 26.7 +VERSION="5.0" 26.8 +CATEGORY="system-tools" 26.9 +SHORT_DESC="Turkish locale pack" 26.10 +MAINTAINER="al.bobylev@gmail.com" 26.11 +LICENSE="GPL3" 26.12 +WEB_SITE="http://www.slitaz.org/" 26.13 +HOST_ARCH="i486 arm" 26.14 + 26.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 26.16 +DEPENDS="glibc-base" 26.17 + 26.18 +LOCALE="tr" 26.19 +LOCALE_DEPENDS="" 26.20 +KBD="trq tr_q-latin5" 26.21 +KB_FLAGS="TR:tr" 26.22 +GCONV="ISO8859-9" 26.23 + 26.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 26.25 +genpkg_rules() 26.26 +{ 26.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 26.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 26.29 + get_locale 26.30 +} 26.31 + 26.32 +# Back to C if it's the last used locale. 26.33 +post_remove() 26.34 +{ 26.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 26.36 +}
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/locale-uk/receipt Sun Jun 28 15:14:56 2015 +0300 27.3 @@ -0,0 +1,33 @@ 27.4 +# SliTaz package receipt 27.5 + 27.6 +PACKAGE="locale-uk" 27.7 +VERSION="5.0" 27.8 +CATEGORY="system-tools" 27.9 +SHORT_DESC="Ukrainian locale pack" 27.10 +MAINTAINER="al.bobylev@gmail.com" 27.11 +LICENSE="GPL3" 27.12 +WEB_SITE="http://www.slitaz.org/" 27.13 +HOST_ARCH="i486 arm" 27.14 + 27.15 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd" 27.16 +DEPENDS="glibc-base" 27.17 + 27.18 +LOCALE="uk" 27.19 +LOCALE_DEPENDS="" 27.20 +KBD="ua" 27.21 +KB_FLAGS="US:us RU:ru UA:ua" 27.22 +GCONV="ISO8859-5 KOI8-R KOI8-U IBM866 CP1251" 27.23 + 27.24 +# Rules to gen a SliTaz package suitable for Tazpkg. 27.25 +genpkg_rules() 27.26 +{ 27.27 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 27.28 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 27.29 + get_locale 27.30 +} 27.31 + 27.32 +# Back to C if it's the last used locale. 27.33 +post_remove() 27.34 +{ 27.35 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 27.36 +}
28.1 --- a/locale-zh_CN/receipt Sun Jun 28 14:56:44 2015 +0300 28.2 +++ b/locale-zh_CN/receipt Sun Jun 28 15:14:56 2015 +0300 28.3 @@ -1,7 +1,7 @@ 28.4 # SliTaz package receipt 28.5 28.6 PACKAGE="locale-zh_CN" 28.7 -VERSION="4.2" 28.8 +VERSION="5.0" 28.9 CATEGORY="system-tools" 28.10 SHORT_DESC="Chinese Simplified locale pack." 28.11 MAINTAINER="lufeng369@slitaz.org" 28.12 @@ -9,13 +9,14 @@ 28.13 WEB_SITE="http://www.slitaz.org/" 28.14 HOST_ARCH="i486 arm" 28.15 28.16 -WANTED="glibc slitaz-i18n xorg-libX11" 28.17 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata" 28.18 DEPENDS="glibc-base wqy-microhei" 28.19 28.20 LOCALE="zh_CN" 28.21 LOCALE_DEPENDS="iso14651_t1_pinyin" # for zh_CN 28.22 -KB_FLAGS="" 28.23 -GCONV="EUC-CN libGB GBK" 28.24 +KBD="" 28.25 +KB_FLAGS="CN:cn" 28.26 +GCONV="EUC-CN GBK GB18030 libGB" 28.27 28.28 # Rules to gen a SliTaz package suitable for Tazpkg. 28.29 genpkg_rules()
29.1 --- a/locale-zh_TW/receipt Sun Jun 28 14:56:44 2015 +0300 29.2 +++ b/locale-zh_TW/receipt Sun Jun 28 15:14:56 2015 +0300 29.3 @@ -1,7 +1,7 @@ 29.4 # SliTaz package receipt 29.5 29.6 PACKAGE="locale-zh_TW" 29.7 -VERSION="4.2" 29.8 +VERSION="5.0" 29.9 CATEGORY="system-tools" 29.10 SHORT_DESC="Chinese Traditional locale pack." 29.11 MAINTAINER="pankso@slitaz.org" 29.12 @@ -9,13 +9,14 @@ 29.13 WEB_SITE="http://www.slitaz.org/" 29.14 HOST_ARCH="i486 arm" 29.15 29.16 -WANTED="glibc slitaz-i18n xorg-libX11" 29.17 +WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata" 29.18 DEPENDS="glibc-base pcf-uming" 29.19 29.20 LOCALE="zh_TW" 29.21 LOCALE_DEPENDS="zh_CN" # for zh_TW 29.22 -KB_FLAGS="" 29.23 -GCONV="BIG5" 29.24 +KBD="" 29.25 +KB_FLAGS="TW:tw" 29.26 +GCONV="BIG5 EUC-TW libCNS" 29.27 29.28 # Rules to gen a SliTaz package suitable for Tazpkg. 29.29 genpkg_rules()
30.1 --- a/slitaz-i18n/receipt Sun Jun 28 14:56:44 2015 +0300 30.2 +++ b/slitaz-i18n/receipt Sun Jun 28 15:14:56 2015 +0300 30.3 @@ -1,7 +1,7 @@ 30.4 # SliTaz package receipt 30.5 30.6 PACKAGE="slitaz-i18n" 30.7 -VERSION="4.2" 30.8 +VERSION="5.0" 30.9 CATEGORY="meta" 30.10 SHORT_DESC="SliTaz internationalization meta package to build locale pack." 30.11 MAINTAINER="pankso@slitaz.org" 30.12 @@ -28,31 +28,29 @@ 30.13 { 30.14 mkdir -p $fs/usr/share/doc/slitaz 30.15 . $stuff/locale-pack.conf 30.16 - for p in $CORE_PKGS 30.17 - do 30.18 + for p in $CORE_PKGS; do 30.19 if [ ! -d "$WOK/$p/install" ]; then 30.20 if [ -x /usr/bin/cook ]; then 30.21 cook $p 30.22 - else 30.23 + elif [ -x /usr/bin/tazwok ]; then 30.24 tazwok cook $p 30.25 fi 30.26 fi 30.27 done 30.28 # Cook all locale pack. 30.29 - for i in $LOCALE_PACK 30.30 - do 30.31 + for i in $LOCALE_PACK; do 30.32 if [ -x /usr/bin/cook ]; then 30.33 cook locale-$i 30.34 elif [ -x /usr/bin/tazwok ]; then 30.35 tazwok cook locale-$i 30.36 fi 30.37 done 30.38 - cat > $fs/usr/share/doc/slitaz/i18n.txt << EOT 30.39 + cat > $fs/usr/share/doc/slitaz/i18n.txt <<EOT 30.40 SliTaz i18n information 30.41 ================================================================================ 30.42 30.43 -This package provides the necessary functions and configs for the SliTaz locale 30.44 -pack. SliTaz uses UTF-8 by default and tazlocale (from SliTaz tools) to 30.45 +This package provides the necessary functions and configs for the SliTaz locale 30.46 +pack. SliTaz uses UTF-8 by default and tazlocale (from SliTaz tools) to 30.47 configure the system language. 30.48 30.49 30.50 @@ -69,4 +67,3 @@ 30.51 ================================================================================ 30.52 EOT 30.53 } 30.54 -
31.1 --- a/slitaz-i18n/stuff/locale-pack.conf Sun Jun 28 14:56:44 2015 +0300 31.2 +++ b/slitaz-i18n/stuff/locale-pack.conf Sun Jun 28 15:14:56 2015 +0300 31.3 @@ -11,4 +11,5 @@ 31.4 CORE_PKGS_ARM="acl attr dialog e2fsprogs jwm libgpg-error lynx nano" 31.5 31.6 # List of all locale pack (locale-xx) 31.7 -LOCALE_PACK="ar cs da de el es fr hu id it pl pt pt_BR ro ru sl sv zh_CN zh_TW" 31.8 +LOCALE_PACK="ar cs da de el en es fi fr hr hu id is it ja nb nl nn pl pt pt_BR \ 31.9 +ro ru sl sv tr uk zh_CN zh_TW"
32.1 --- a/slitaz-i18n/stuff/locale-pack.functions Sun Jun 28 14:56:44 2015 +0300 32.2 +++ b/slitaz-i18n/stuff/locale-pack.functions Sun Jun 28 15:14:56 2015 +0300 32.3 @@ -1,13 +1,13 @@ 32.4 get_locale() 32.5 { 32.6 - [ "x$CHARMAP" == x ] && CHARMAP=UTF-8 32.7 + [ -z "$CHARMAP" ] && CHARMAP='UTF-8' 32.8 32.9 case "$SLITAZ_ARCH" in 32.10 arm*) ;; 32.11 i?86) 32.12 # Get translated Openbox menu from SliTaz sub project slitaz-configs 32.13 - obmenu=$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml 32.14 - if [ -f $obmenu ]; then 32.15 + obmenu="$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml" 32.16 + if [ -f "$obmenu" ]; then 32.17 mkdir -p $fs/etc/xdg/openbox 32.18 echo "* Found $LOCALE translations for: openbox menu" 32.19 cp $obmenu $fs/etc/xdg/openbox 32.20 @@ -21,8 +21,8 @@ 32.21 esac 32.22 mkdir -p $fs/usr/share/locale/$LOCALE 32.23 for app in $CORE_PKGS; do 32.24 - app_locale=$WOK/$app/install/usr/share/locale/$LOCALE 32.25 - if [ -d $app_locale ]; then 32.26 + app_locale="$WOK/$app/install/usr/share/locale/$LOCALE" 32.27 + if [ -d "$app_locale" ]; then 32.28 echo "* Found $LOCALE translations for: $app" 32.29 cp -a $app_locale $fs/usr/share/locale 32.30 fi 32.31 @@ -31,27 +31,34 @@ 32.32 # List of available locales 32.33 cd $WOK/glibc/install/usr/share/i18n/locales 32.34 locales=$(ls -1 | sed -n '/^'$LOCALE'$/p; /^'$LOCALE'_.*/p' | sed '/translit/d') 32.35 - [ "x$LOCALEDEF" != x ] && locales=$LOCALEDEF 32.36 + [ -n "$LOCALEDEF" ] && locales="$LOCALEDEF" 32.37 32.38 # Get X11 locale 32.39 for def in $locales; do 32.40 - x11_locale=$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP 32.41 - if [ -d $x11_locale ]; then 32.42 - echo "* Found $def.$CHARMAP locale for: X11" 32.43 - mkdir -p $fs/usr/share/X11/locale 32.44 - cp -a $x11_locale $fs/usr/share/X11/locale 32.45 - fi 32.46 + x11_locale="$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP" 32.47 + case "$def.$CHARMAP" in 32.48 + en_US.UTF-8) 32.49 + # belongs to "xorg-libX11" package, skip it 32.50 + ;; 32.51 + *) 32.52 + if [ -d "$x11_locale" ]; then 32.53 + echo "* Found $def.$CHARMAP locale for: X11" 32.54 + mkdir -p $fs/usr/share/X11/locale 32.55 + cp -a $x11_locale $fs/usr/share/X11/locale 32.56 + fi 32.57 + ;; 32.58 + esac 32.59 done 32.60 32.61 # Get locale definition files 32.62 - usil=usr/share/i18n/locales 32.63 + usil='usr/share/i18n/locales' 32.64 for def in $locales; do 32.65 echo "* Copying $def locale files" 32.66 mkdir -p $fs/$usil 32.67 cp -a $WOK/glibc/install/$usil/$def $fs/$usil 32.68 done 32.69 32.70 - if [ "x$LOCALE_DEPENDS" != x ]; then 32.71 + if [ -n "$LOCALE_DEPENDS" ]; then 32.72 for dep in $LOCALE_DEPENDS; do 32.73 echo "* Copying additional $dep locale files" 32.74 cp -a $WOK/glibc/install/usr/share/i18n/locales/$dep \ 32.75 @@ -59,6 +66,8 @@ 32.76 done 32.77 fi 32.78 32.79 + #grep -r 'include' $fs/usr/share/i18n/locales # test includes in locales 32.80 + 32.81 # Get timezones from tzdata 32.82 countries=$(echo $locales | \ 32.83 sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u) 32.84 @@ -82,7 +91,7 @@ 32.85 32.86 # Get country flags 32.87 echo "* Copy flag icons for countries: "$countries 32.88 - usih=usr/share/icons/hicolor 32.89 + usih='usr/share/icons/hicolor' 32.90 for country in $countries; do 32.91 for size in 16x16 48x48; do 32.92 install -Dm644 \ 32.93 @@ -91,22 +100,37 @@ 32.94 done 32.95 done 32.96 # above icons credits 32.97 - fusl=$fs/usr/share/licenses 32.98 + fusl="$fs/usr/share/licenses" 32.99 mkdir -p $fusl 32.100 cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt 32.101 32.102 # Gconv modules for encodings other than default 32.103 - if [ "x$GCONV" != x ]; then 32.104 + if [ -n "$GCONV" ]; then 32.105 mkdir -p $fs/usr/lib/gconv 32.106 for enc in $GCONV; do 32.107 echo "* Copying $enc gconv module" 32.108 cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv 32.109 done 32.110 + #ldd $fs/usr/lib/gconv/* # test depends in gconv modules 32.111 + fi 32.112 + 32.113 + # Console keyboard layouts 32.114 + if [ -n "$KBD" ]; then 32.115 + uskki='usr/share/kbd/keymaps/i386' 32.116 + cd $WOK/kbd/install 32.117 + for map in $KBD; do 32.118 + echo "* Copying $map kbd map" 32.119 + mapfiles=$(find . -type f -name $map.map.gz) 32.120 + for mapfile in $mapfiles; do 32.121 + mkdir -p "$fs/$(dirname "${mapfile#./}")" 32.122 + cp "$WOK/kbd/install/${mapfile#./}" "$fs/${mapfile#./}" 32.123 + done 32.124 + done 32.125 fi 32.126 32.127 # Keyboard flags for default lxpanel keyboard applet 32.128 - if [ "x$KB_FLAGS" != x ]; then 32.129 - uslix=usr/share/lxpanel/images/xkb-flags 32.130 + if [ -n "$KB_FLAGS" ]; then 32.131 + uslix='usr/share/lxpanel/images/xkb-flags' 32.132 mkdir -p $fs/$uslix 32.133 for i in $KB_FLAGS; do 32.134 install -Dm644 \
33.1 --- a/syslinux/receipt Sun Jun 28 14:56:44 2015 +0300 33.2 +++ b/syslinux/receipt Sun Jun 28 15:14:56 2015 +0300 33.3 @@ -76,8 +76,8 @@ 33.4 cz cz-lat2 cs_CZ Cesky 33.5 dk dk-latin1 da_DK Dansk 33.6 de de-latin1 de_DE Deutsch 33.7 -de_CH\ deCH de_CH-latin1 de_DE Deutsch Schweiz 33.8 -sg sg-latin1 de_DE Deutsch Schweiz (sg) 33.9 +de_CH\ deCH de_CH-latin1 de_CH Deutsch Schweiz 33.10 +sg sg-latin1 de_CH Deutsch Schweiz (sg) 33.11 gr gr el_GR Ellinika 33.12 en uk en_GB English UK 33.13 us us en_US English US 33.14 @@ -87,9 +87,9 @@ 33.15 us_dr\ usdr dvorak-r en_US English US (dvorak-r) 33.16 es es es_ES Espanol 33.17 fr fr-latin1 fr_FR Francais 33.18 -be be-latin1 fr_FR Francais Belgique 33.19 -ca cf fr_FR Francais Canada 33.20 -fr_CH\ frCH fr_CH-latin1 fr_FR Francais Suisse 33.21 +be be-latin1 fr_BE Francais Belgique 33.22 +ca cf fr_CA Francais Canada 33.23 +fr_CH\ frCH fr_CH-latin1 fr_CH Francais Suisse 33.24 cr hr,croat hr_HR Hrvatski 33.25 is is-latin1 is_IS Islenska 33.26 it it it_IT Italiano 33.27 @@ -101,7 +101,7 @@ 33.28 po pl2 pl_PL Polski 33.29 pt pt-latin1 pt_PT Portugues 33.30 ru ru ru_RU Russian 33.31 -sl slovene sl_SL Slovenski 33.32 +sl slovene sl_SI Slovenski 33.33 fi fi fi_FI Suomi 33.34 se se-lat6 sv_SE Svenska 33.35 tr trq tr_TR Turkce