wok-6.x rev 16551
ttf-roboto, ttf-roboto-base: fix source paths; slitaz-i18n: now get info from tzdata and add country flags; add locale-ar; locale-**: remove stuff, small edits.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Apr 29 21:37:23 2014 +0000 (2014-04-29) |
| parents | abb8eb9a3350 |
| children | 5c027260e632 |
| files | locale-ar/receipt locale-cs/receipt locale-da/receipt locale-de/receipt locale-el/receipt locale-el/stuff/LICENSE.txt locale-el/stuff/gr.png locale-el/stuff/us.png locale-es/receipt locale-fr/receipt locale-hu/receipt locale-id/receipt locale-it/receipt locale-pl/receipt locale-pt/receipt locale-pt_BR/receipt locale-ru/receipt locale-ru/stuff/16x16/RU.png locale-ru/stuff/16x16/UA.png locale-ru/stuff/16x16/US.png locale-ru/stuff/48x48/RU.png locale-ru/stuff/48x48/UA.png locale-ru/stuff/48x48/US.png locale-ru/stuff/LICENSE.txt locale-sl/receipt locale-sv/receipt locale-zh_CN/receipt locale-zh_TW/receipt slitaz-i18n/stuff/locale-pack.functions ttf-roboto-base/receipt ttf-roboto/receipt |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/locale-ar/receipt Tue Apr 29 21:37:23 2014 +0000 1.3 @@ -0,0 +1,34 @@ 1.4 +# SliTaz package receipt 1.5 + 1.6 +PACKAGE="locale-ar" 1.7 +VERSION="4.1" 1.8 +CATEGORY="system-tools" 1.9 +SHORT_DESC="Arabic locale pack" 1.10 +MAINTAINER="al.bobylev@gmail.com" 1.11 +LICENSE="GPL3" 1.12 +WEB_SITE="http://www.slitaz.org/" 1.13 + 1.14 +WANTED="glibc slitaz-i18n xorg-libX11" 1.15 +DEPENDS="glibc-base" 1.16 + 1.17 +LOCALE="ar" 1.18 +ADD_FLAGS="US" 1.19 +LXPANEL_FLAGS="us" 1.20 + 1.21 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.22 +genpkg_rules() 1.23 +{ 1.24 + . $WOK/slitaz-i18n/stuff/locale-pack.functions 1.25 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 1.26 + get_locale 1.27 + 1.28 + # use Saudi Arabia flag for Arabic keyboard layout 1.29 + ln -s /usr/share/icons/hicolor/16x16/intl/SA.png \ 1.30 + $fs/usr/share/lxpanel/images/xkb-flags/ara.png 1.31 +} 1.32 + 1.33 +# Back to C if it's the last used locale. 1.34 +post_remove() 1.35 +{ 1.36 + echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf 1.37 +}
2.1 --- a/locale-cs/receipt Tue Apr 29 19:18:57 2014 +0000 2.2 +++ b/locale-cs/receipt Tue Apr 29 21:37:23 2014 +0000 2.3 @@ -12,6 +12,8 @@ 2.4 DEPENDS="glibc-base" 2.5 2.6 LOCALE="cs" 2.7 +ADD_FLAGS="" 2.8 +LXPANEL_FLAGS="" 2.9 2.10 # Rules to gen a SliTaz package suitable for Tazpkg. 2.11 genpkg_rules()
3.1 --- a/locale-da/receipt Tue Apr 29 19:18:57 2014 +0000 3.2 +++ b/locale-da/receipt Tue Apr 29 21:37:23 2014 +0000 3.3 @@ -12,6 +12,8 @@ 3.4 DEPENDS="glibc-base" 3.5 3.6 LOCALE="da" 3.7 +ADD_FLAGS="" 3.8 +LXPANEL_FLAGS="" 3.9 3.10 # Rules to gen a SliTaz package suitable for Tazpkg. 3.11 genpkg_rules()
4.1 --- a/locale-de/receipt Tue Apr 29 19:18:57 2014 +0000 4.2 +++ b/locale-de/receipt Tue Apr 29 21:37:23 2014 +0000 4.3 @@ -12,6 +12,8 @@ 4.4 DEPENDS="glibc-base" 4.5 4.6 LOCALE="de" 4.7 +ADD_FLAGS="" 4.8 +LXPANEL_FLAGS="" 4.9 4.10 # Rules to gen a SliTaz package suitable for Tazpkg. 4.11 genpkg_rules()
5.1 --- a/locale-el/receipt Tue Apr 29 19:18:57 2014 +0000 5.2 +++ b/locale-el/receipt Tue Apr 29 21:37:23 2014 +0000 5.3 @@ -12,6 +12,8 @@ 5.4 DEPENDS="glibc-base" 5.5 5.6 LOCALE="el" 5.7 +ADD_FLAGS="US" 5.8 +LXPANEL_FLAGS="us gr" 5.9 5.10 # Rules to gen a SliTaz package suitable for Tazpkg. 5.11 genpkg_rules() 5.12 @@ -19,11 +21,6 @@ 5.13 . $WOK/slitaz-i18n/stuff/locale-pack.functions 5.14 . $WOK/slitaz-i18n/stuff/locale-pack.conf 5.15 get_locale 5.16 - 5.17 - mkdir -p $fs/usr/share/lxpanel/images/xkb-flags 5.18 - for i in us.png gr.png LICENSE.txt; do 5.19 - install -m644 $stuff/$i $fs/usr/share/lxpanel/images/xkb-flags/$i 5.20 - done 5.21 } 5.22 5.23 # Back to C if it's the last used locale.
6.1 --- a/locale-el/stuff/LICENSE.txt Tue Apr 29 19:18:57 2014 +0000 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,7 +0,0 @@ 6.4 -Copyright (c) 2013 Go Squared Ltd. http://www.gosquared.com/ 6.5 - 6.6 -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 6.7 - 6.8 -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 6.9 - 6.10 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7.1 Binary file locale-el/stuff/gr.png has changed
8.1 Binary file locale-el/stuff/us.png has changed
9.1 --- a/locale-es/receipt Tue Apr 29 19:18:57 2014 +0000 9.2 +++ b/locale-es/receipt Tue Apr 29 21:37:23 2014 +0000 9.3 @@ -12,6 +12,8 @@ 9.4 DEPENDS="glibc-base" 9.5 9.6 LOCALE="es" 9.7 +ADD_FLAGS="" 9.8 +LXPANEL_FLAGS="" 9.9 9.10 # Rules to gen a SliTaz package suitable for Tazpkg. 9.11 genpkg_rules()
10.1 --- a/locale-fr/receipt Tue Apr 29 19:18:57 2014 +0000 10.2 +++ b/locale-fr/receipt Tue Apr 29 21:37:23 2014 +0000 10.3 @@ -12,6 +12,8 @@ 10.4 DEPENDS="glibc-base" 10.5 10.6 LOCALE="fr" 10.7 +ADD_FLAGS="" 10.8 +LXPANEL_FLAGS="" 10.9 10.10 # Rules to gen a SliTaz package suitable for Tazpkg. 10.11 genpkg_rules()
11.1 --- a/locale-hu/receipt Tue Apr 29 19:18:57 2014 +0000 11.2 +++ b/locale-hu/receipt Tue Apr 29 21:37:23 2014 +0000 11.3 @@ -12,6 +12,8 @@ 11.4 DEPENDS="glibc-base" 11.5 11.6 LOCALE="hu" 11.7 +ADD_FLAGS="" 11.8 +LXPANEL_FLAGS="" 11.9 11.10 # Rules to gen a SliTaz package suitable for Tazpkg. 11.11 genpkg_rules()
12.1 --- a/locale-id/receipt Tue Apr 29 19:18:57 2014 +0000 12.2 +++ b/locale-id/receipt Tue Apr 29 21:37:23 2014 +0000 12.3 @@ -12,6 +12,8 @@ 12.4 DEPENDS="glibc-base" 12.5 12.6 LOCALE="id" 12.7 +ADD_FLAGS="" 12.8 +LXPANEL_FLAGS="" 12.9 12.10 # Rules to gen a SliTaz package suitable for Tazpkg. 12.11 genpkg_rules()
13.1 --- a/locale-it/receipt Tue Apr 29 19:18:57 2014 +0000 13.2 +++ b/locale-it/receipt Tue Apr 29 21:37:23 2014 +0000 13.3 @@ -12,6 +12,8 @@ 13.4 DEPENDS="glibc-base" 13.5 13.6 LOCALE="it" 13.7 +ADD_FLAGS="" 13.8 +LXPANEL_FLAGS="" 13.9 13.10 # Rules to gen a SliTaz package suitable for Tazpkg. 13.11 genpkg_rules()
14.1 --- a/locale-pl/receipt Tue Apr 29 19:18:57 2014 +0000 14.2 +++ b/locale-pl/receipt Tue Apr 29 21:37:23 2014 +0000 14.3 @@ -12,6 +12,8 @@ 14.4 DEPENDS="glibc-base" 14.5 14.6 LOCALE="pl" 14.7 +ADD_FLAGS="" 14.8 +LXPANEL_FLAGS="" 14.9 14.10 # Rules to gen a SliTaz package suitable for Tazpkg. 14.11 genpkg_rules()
15.1 --- a/locale-pt/receipt Tue Apr 29 19:18:57 2014 +0000 15.2 +++ b/locale-pt/receipt Tue Apr 29 21:37:23 2014 +0000 15.3 @@ -13,6 +13,8 @@ 15.4 15.5 LOCALE="pt" 15.6 LOCALEDEF="pt_PT pt_PT@euro" 15.7 +ADD_FLAGS="" 15.8 +LXPANEL_FLAGS="" 15.9 15.10 # Rules to gen a SliTaz package suitable for Tazpkg. 15.11 genpkg_rules()
16.1 --- a/locale-pt_BR/receipt Tue Apr 29 19:18:57 2014 +0000 16.2 +++ b/locale-pt_BR/receipt Tue Apr 29 21:37:23 2014 +0000 16.3 @@ -12,6 +12,8 @@ 16.4 DEPENDS="glibc-base" 16.5 16.6 LOCALE="pt_BR" 16.7 +ADD_FLAGS="" 16.8 +LXPANEL_FLAGS="" 16.9 16.10 # Rules to gen a SliTaz package suitable for Tazpkg. 16.11 genpkg_rules()
17.1 --- a/locale-ru/receipt Tue Apr 29 19:18:57 2014 +0000 17.2 +++ b/locale-ru/receipt Tue Apr 29 21:37:23 2014 +0000 17.3 @@ -12,6 +12,8 @@ 17.4 DEPENDS="glibc-base" 17.5 17.6 LOCALE="ru" 17.7 +ADD_FLAGS="US" 17.8 +LXPANEL_FLAGS="us ru ua" 17.9 17.10 # Rules to gen a SliTaz package suitable for Tazpkg. 17.11 genpkg_rules() 17.12 @@ -19,25 +21,6 @@ 17.13 . $WOK/slitaz-i18n/stuff/locale-pack.functions 17.14 . $WOK/slitaz-i18n/stuff/locale-pack.conf 17.15 get_locale 17.16 - 17.17 - # country flags used in the some dialogs 17.18 - usih=usr/share/icons/hicolor 17.19 - for size in 16x16 48x48; do 17.20 - mkdir -p $fs/$usih/$size/intl 17.21 - cp -a $stuff/$size/* $fs/$usih/$size/intl 17.22 - done 17.23 - 17.24 - # keyboard flags for default lxpanel keyboard applet 17.25 - uslix=usr/share/lxpanel/images/xkb-flags 17.26 - mkdir -p $fs/$uslix 17.27 - for i in us ru ua; do 17.28 - ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png 17.29 - done 17.30 - 17.31 - # above icons credits 17.32 - fusl=$fs/usr/share/licenses 17.33 - mkdir -p $fusl 17.34 - cp -a $stuff/LICENSE.txt $fusl/gosquared.txt 17.35 } 17.36 17.37 # Back to C if it's the last used locale.
18.1 Binary file locale-ru/stuff/16x16/RU.png has changed
19.1 Binary file locale-ru/stuff/16x16/UA.png has changed
20.1 Binary file locale-ru/stuff/16x16/US.png has changed
21.1 Binary file locale-ru/stuff/48x48/RU.png has changed
22.1 Binary file locale-ru/stuff/48x48/UA.png has changed
23.1 Binary file locale-ru/stuff/48x48/US.png has changed
24.1 --- a/locale-ru/stuff/LICENSE.txt Tue Apr 29 19:18:57 2014 +0000 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,7 +0,0 @@ 24.4 -Copyright (c) 2013 Go Squared Ltd. http://www.gosquared.com/ 24.5 - 24.6 -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 24.7 - 24.8 -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 24.9 - 24.10 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25.1 --- a/locale-sl/receipt Tue Apr 29 19:18:57 2014 +0000 25.2 +++ b/locale-sl/receipt Tue Apr 29 21:37:23 2014 +0000 25.3 @@ -12,6 +12,8 @@ 25.4 DEPENDS="glibc-base" 25.5 25.6 LOCALE="sl" 25.7 +ADD_FLAGS="" 25.8 +LXPANEL_FLAGS="" 25.9 25.10 # Rules to gen a SliTaz package suitable for Tazpkg. 25.11 genpkg_rules()
26.1 --- a/locale-sv/receipt Tue Apr 29 19:18:57 2014 +0000 26.2 +++ b/locale-sv/receipt Tue Apr 29 21:37:23 2014 +0000 26.3 @@ -12,6 +12,8 @@ 26.4 DEPENDS="glibc-base" 26.5 26.6 LOCALE="sv" 26.7 +ADD_FLAGS="" 26.8 +LXPANEL_FLAGS="" 26.9 26.10 # Rules to gen a SliTaz package suitable for Tazpkg. 26.11 genpkg_rules()
27.1 --- a/locale-zh_CN/receipt Tue Apr 29 19:18:57 2014 +0000 27.2 +++ b/locale-zh_CN/receipt Tue Apr 29 21:37:23 2014 +0000 27.3 @@ -12,6 +12,8 @@ 27.4 DEPENDS="glibc-base wqy-microhei" 27.5 27.6 LOCALE="zh_CN" 27.7 +ADD_FLAGS="" 27.8 +LXPANEL_FLAGS="" 27.9 27.10 # Rules to gen a SliTaz package suitable for Tazpkg. 27.11 genpkg_rules()
28.1 --- a/locale-zh_TW/receipt Tue Apr 29 19:18:57 2014 +0000 28.2 +++ b/locale-zh_TW/receipt Tue Apr 29 21:37:23 2014 +0000 28.3 @@ -12,6 +12,8 @@ 28.4 DEPENDS="glibc-base pcf-uming" 28.5 28.6 LOCALE="zh_TW" 28.7 +ADD_FLAGS="" 28.8 +LXPANEL_FLAGS="" 28.9 28.10 # Rules to gen a SliTaz package suitable for Tazpkg. 28.11 genpkg_rules()
29.1 --- a/slitaz-i18n/stuff/locale-pack.functions Tue Apr 29 19:18:57 2014 +0000 29.2 +++ b/slitaz-i18n/stuff/locale-pack.functions Tue Apr 29 21:37:23 2014 +0000 29.3 @@ -35,17 +35,7 @@ 29.4 fi 29.5 done 29.6 29.7 - # NO: This we gen a huge /usr/lib/locale directory. We gen locale file 29.8 - # at boot and glibc-locale is not needed for that. 29.9 - # 29.10 - # Pregenerate locale file so we dont need glibc-locale as dep. 29.11 - #for def in $locales; do 29.12 - # echo "* Generate $def locale definition" 29.13 - # mkdir -p $fs/usr/lib/locale 29.14 - # localedef -i $def -c -f $CHARMAP $fs/usr/lib/locale/$def 29.15 - #done 29.16 - 29.17 - # OK, Christophe. So, we still need next // Aleksej 29.18 + # Get locale definition files 29.19 usil=usr/share/i18n/locales 29.20 for def in $locales; do 29.21 echo "* Copying $def locale files" 29.22 @@ -53,20 +43,44 @@ 29.23 cp -a $WOK/glibc/install/$usil/$def $fs/$usil 29.24 done 29.25 29.26 - # Get timezones 29.27 + # Get timezones from tzdata 29.28 countries=$(echo $locales | \ 29.29 sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u) 29.30 echo "* Copy timezone info for countries: "$countries 29.31 locations='' 29.32 for country in $countries; do 29.33 location=$(grep '^'$country \ 29.34 - $WOK/glibc/install/usr/share/zoneinfo/zone.tab | awk '{ print $3}') 29.35 + $WOK/tzdata/install/usr/share/zoneinfo/zone.tab | awk '{ print $3}') 29.36 locations="$locations $location" 29.37 done 29.38 for location in $locations; do 29.39 - for tz in $location posix/$location right/$location; do 29.40 - install -Dm644 /usr/share/zoneinfo/$tz \ 29.41 + for tz in $location; do 29.42 + install -Dm644 $WOK/tzdata/install/usr/share/zoneinfo/$tz \ 29.43 $fs/usr/share/zoneinfo/$tz 29.44 done 29.45 done 29.46 + 29.47 + # Get country flags 29.48 + for country in $countries $ADD_FLAGS; do 29.49 + for size in 16x16 48x48; do 29.50 + install -Dm644 \ 29.51 + $WOK/flag-icons/taz/*/fs/usr/share/icons/hicolor/$size/intl/$country.png \ 29.52 + $fs/usr/share/icons/hicolor/$size/intl/$country.png 29.53 + done 29.54 + done 29.55 + # above icons credits 29.56 + fusl=$fs/usr/share/licenses 29.57 + mkdir -p $fusl 29.58 + cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt 29.59 + 29.60 + # Keyboard flags for default lxpanel keyboard applet 29.61 + if [ "x$LXPANEL_FLAGS" != "x" ]; then 29.62 + uslix=usr/share/lxpanel/images/xkb-flags 29.63 + mkdir -p $fs/$uslix 29.64 + for i in $LXPANEL_FLAGS; do 29.65 + ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png 29.66 + done 29.67 + fi 29.68 + 29.69 + echo 29.70 }
30.1 --- a/ttf-roboto-base/receipt Tue Apr 29 19:18:57 2014 +0000 30.2 +++ b/ttf-roboto-base/receipt Tue Apr 29 21:37:23 2014 +0000 30.3 @@ -18,6 +18,6 @@ 30.4 mkdir -p $FONTPATH 30.5 30.6 for FONT in Regular Bold Italic BoldItalic; do 30.7 - install -Dm444 $src/Roboto/Roboto-$FONT.ttf $FONTPATH 30.8 + install -Dm444 $src/Roboto_v$VERSION/Roboto/Roboto-$FONT.ttf $FONTPATH 30.9 done 30.10 }
31.1 --- a/ttf-roboto/receipt Tue Apr 29 19:18:57 2014 +0000 31.2 +++ b/ttf-roboto/receipt Tue Apr 29 21:37:23 2014 +0000 31.3 @@ -17,7 +17,8 @@ 31.4 FONTPATH=$fs/usr/share/fonts/truetype/ttf-roboto 31.5 mkdir -p $FONTPATH 31.6 31.7 - for FILE in $src/Roboto/*.ttf $src/RobotoCondensed/*.ttf; do 31.8 + for FILE in $src/Roboto_v$VERSION/Roboto/*.ttf \ 31.9 + $src/Roboto_v$VERSION/RobotoCondensed/*.ttf; do 31.10 install -Dm444 $FILE $FONTPATH 31.11 done 31.12 # these files are included in the package ttf-roboto-base