wok rev 14904
kbd*: up 1.15.5; retawq and kbd: place .mo files to right place; locale-pl: try to fix; slitaz-i18n: no more pcmanfm, kbd really not a core package but contains translations for kbd-base.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Jul 31 20:21:51 2013 +0300 (2013-07-31) |
| parents | c40da21aa3a1 |
| children | c9dc972e6946 |
| files | kbd-base/receipt kbd-busybox/receipt kbd-vlock/receipt kbd/receipt kbd/stuff/fix-es.po.patch locale-pl/receipt retawq/receipt retawq/stuff/retawq.desktop retawq/stuff/skel/.retawq/config slitaz-i18n/stuff/locale-pack.conf |
line diff
1.1 --- a/kbd-base/receipt Wed Jul 31 14:12:39 2013 +0300 1.2 +++ b/kbd-base/receipt Wed Jul 31 20:21:51 2013 +0300 1.3 @@ -1,15 +1,16 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="kbd-base" 1.7 -VERSION="1.15.3" 1.8 +VERSION="1.15.5" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="Keyboard maping definitions and loadkeys utility." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 LICENSE="GPL2" 1.13 -WANTED="kbd" 1.14 WEB_SITE="http://kbd-project.org/" 1.15 HOST_ARCH="i486 arm" 1.16 1.17 +WANTED="kbd" 1.18 + 1.19 # Make sure it will run on host or no keyboard support... 1.20 testsuite() 1.21 { 1.22 @@ -21,21 +22,24 @@ 1.23 { 1.24 mkdir -p $fs/bin 1.25 cp -a $install/usr/bin/loadkeys $fs/bin 1.26 + 1.27 # Dirs 1.28 for dir in dvorak azerty qwerty qwertz; do 1.29 mkdir -p $fs/usr/share/kbd/keymaps/i386/$dir 1.30 done 1.31 + 1.32 # i386 keymaps only. 1.33 - for keymap in $(cat $stuff/keymaps-path.list) 1.34 - do 1.35 + for keymap in $(cat $stuff/keymaps-path.list); do 1.36 cp -a $install/usr/share/kbd/keymaps/i386/$keymap \ 1.37 $fs/usr/share/kbd/keymaps/i386/$keymap 1.38 done 1.39 + 1.40 # Include files 1.41 cp -a $install/usr/share/kbd/keymaps/include \ 1.42 $fs/usr/share/kbd/keymaps 1.43 cp -a $install/usr/share/kbd/keymaps/i386/include \ 1.44 $fs/usr/share/kbd/keymaps/i386/include 1.45 + 1.46 # X11 keyboard aliases 1.47 while read X keymap ; do 1.48 ln -s $keymap.map.gz $fs/usr/share/kbd/keymaps/i386/$X.map.gz 1.49 @@ -43,4 +47,3 @@ 1.50 qwertz/hr croat 1.51 EOT 1.52 } 1.53 -
2.1 --- a/kbd-busybox/receipt Wed Jul 31 14:12:39 2013 +0300 2.2 +++ b/kbd-busybox/receipt Wed Jul 31 20:21:51 2013 +0300 2.3 @@ -1,25 +1,25 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="kbd-busybox" 2.7 -VERSION="1.15.3" 2.8 +VERSION="1.15.5" 2.9 CATEGORY="base-system" 2.10 SHORT_DESC="Keyboard maping 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 -WEB_SITE="http://www.slitaz.org/" 2.17 2.18 # Rules to configure and make the package. 2.19 compile_rules() 2.20 { 2.21 mkdir -p $install/usr/share/kmap 2.22 - cd $src 2.23 dumpkmap > current.kmap || return 1 2.24 for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do 2.25 [ "$(dirname $i)" = "include" ] && continue 2.26 k=$(basename $i) 2.27 k=${k%.map.gz} 2.28 - loadkeys /usr/share/kbd/keymaps/i386/$i && 2.29 + loadkeys -u /usr/share/kbd/keymaps/i386/$i && 2.30 dumpkmap > $install/usr/share/kmap/$k.kmap 2.31 dumpkmap | cmp current.kmap - > /dev/null && map=$i 2.32 done 2.33 @@ -31,4 +31,3 @@ 2.34 { 2.35 cp -a $install/usr $fs 2.36 } 2.37 -
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/kbd-vlock/receipt Wed Jul 31 20:21:51 2013 +0300 3.3 @@ -0,0 +1,20 @@ 3.4 +# SliTaz package receipt. 3.5 + 3.6 +PACKAGE="kbd-vlock" 3.7 +VERSION="1.15.5" 3.8 +CATEGORY="system-tools" 3.9 +SHORT_DESC="vlock - Virtual Console lock program" 3.10 +MAINTAINER="al.bobylev@gmail.com" 3.11 +LICENSE="GPL2" 3.12 +WEB_SITE="http://kbd-project.org/" 3.13 +TAGS="console" 3.14 + 3.15 +WANTED="kbd" 3.16 +DEPENDS="pam" 3.17 + 3.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 3.19 +genpkg_rules() 3.20 +{ 3.21 + mkdir -p $fs/usr/bin 3.22 + cp -a $install/usr/bin/vlock $fs/usr/bin 3.23 +}
4.1 --- a/kbd/receipt Wed Jul 31 14:12:39 2013 +0300 4.2 +++ b/kbd/receipt Wed Jul 31 20:21:51 2013 +0300 4.3 @@ -1,26 +1,29 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="kbd" 4.7 -VERSION="1.15.3" 4.8 +VERSION="1.15.5" 4.9 CATEGORY="system-tools" 4.10 SHORT_DESC="Keyboard maping definitions and tools." 4.11 MAINTAINER="pankso@slitaz.org" 4.12 LICENSE="GPL2" 4.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.14 WEB_SITE="http://kbd-project.org/" 4.15 -WGET_URL="http://kbd-project.org/download/$TARBALL" 4.16 +#WGET_URL="http://kbd-project.org/download/$TARBALL" 4.17 +WGET_URL="ftp://ftp.altlinux.org/pub/people/legion/kbd/$TARBALL" 4.18 TAGS="keyboard" 4.19 HOST_ARCH="i486 arm" 4.20 4.21 -#BUILD_DEPENDS="flex" 4.22 +DEPENDS="kbd-base" 4.23 +BUILD_DEPENDS="flex pam-dev" 4.24 4.25 # Rules to configure and make the package. 4.26 compile_rules() 4.27 { 4.28 - cd $src 4.29 - patch -Np1 -i $stuff/fix-es.po.patch 4.30 + # standard locale placement 4.31 + sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in 4.32 ./configure \ 4.33 --datadir=/usr/share/kbd \ 4.34 + --localedir=/usr/share/locale \ 4.35 $CONFIGURE_ARGS && 4.36 make && make install 4.37 } 4.38 @@ -30,13 +33,19 @@ 4.39 { 4.40 mkdir -p $fs/usr/share 4.41 4.42 - # Copy all kbd files (should we split fonts ?) and remove the one 4.43 - # provided by: kbd-base. 4.44 - cp -a $_pkg/usr/share/kbd $fs/usr/share 4.45 - rm -rf $fs/usr/share/kbd/keymaps/i386 4.46 + # Copy all kbd files (should we split fonts?) 4.47 + cp -a $install/usr/share/kbd $fs/usr/share 4.48 4.49 # Tools 4.50 cp -a $install/usr/bin $fs/usr 4.51 + 4.52 + # Remove files provided by kbd-base and kbd-vlock. 4.53 + for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list); do 4.54 + rm -f $fs/usr/share/kbd/keymaps/i386/$keymap 4.55 + done 4.56 + rm -rf $fs/usr/share/kbd/keymaps/include 4.57 + rm -rf $fs/usr/share/kbd/keymaps/i386/include 4.58 + rm -f $fs/usr/bin/loadkeys $fs/usr/bin/vlock 4.59 } 4.60 4.61 # Overlap busybox
5.1 --- a/kbd/stuff/fix-es.po.patch Wed Jul 31 14:12:39 2013 +0300 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,11 +0,0 @@ 5.4 ---- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 5.5 -+++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 5.6 -@@ -1363,7 +1363,7 @@ 5.7 - #: src/setfont.c:682 5.8 - #, c-format 5.9 - msgid "Saved %d-char %dx%d font file on %s\n" 5.10 --msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" 5.11 -+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" 5.12 - 5.13 - #: src/setkeycodes.c:21 5.14 - #, c-format
6.1 --- a/locale-pl/receipt Wed Jul 31 14:12:39 2013 +0300 6.2 +++ b/locale-pl/receipt Wed Jul 31 20:21:51 2013 +0300 6.3 @@ -23,7 +23,7 @@ 6.4 mk_locale_dir 6.5 get_slitaz_messages 6.6 get_core_messages 6.7 - get_x11_locale 6.8 + #get_x11_locale 6.9 } 6.10 6.11 # Back to C if it's the last used locale.
7.1 --- a/retawq/receipt Wed Jul 31 14:12:39 2013 +0300 7.2 +++ b/retawq/receipt Wed Jul 31 20:21:51 2013 +0300 7.3 @@ -5,6 +5,7 @@ 7.4 CATEGORY="network" 7.5 SHORT_DESC="Text mode Web browser." 7.6 MAINTAINER="pankso@slitaz.org" 7.7 +LICENSE="GPL2" 7.8 TARBALL="$PACKAGE-$VERSION.tar.gz" 7.9 WEB_SITE="http://retawq.sourceforge.net/" 7.10 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 7.11 @@ -43,12 +44,10 @@ 7.12 mkdir -p $fs/etc $fs/usr/bin 7.13 cp -a $src/retawq $fs/usr/bin 7.14 cp -a $stuff/skel $fs/etc 7.15 - # I18n 7.16 - for lang in $LOCALE; do 7.17 - if [ -f "$src/i18n/$lang.mo" ]; then 7.18 - mkdir -p $fs/usr/share/locale/$lang/LC_MESSAGES 7.19 - cp $src/i18n/$lang.mo \ 7.20 - $fs/usr/share/locale/$lang/LC_MESSAGES/retawq.mo 7.21 - fi 7.22 + # I18n for locale-* packages 7.23 + for lang in de es fr ja pt_BR; do 7.24 + mkdir -p $install/usr/share/locale/$lang/LC_MESSAGES 7.25 + cp $src/i18n/$lang.mo \ 7.26 + $install/usr/share/locale/$lang/LC_MESSAGES/retawq.mo 7.27 done 7.28 }
8.1 --- a/retawq/stuff/retawq.desktop Wed Jul 31 14:12:39 2013 +0300 8.2 +++ b/retawq/stuff/retawq.desktop Wed Jul 31 20:21:51 2013 +0300 8.3 @@ -1,8 +1,11 @@ 8.4 [Desktop Entry] 8.5 -Encoding=UTF-8 8.6 +Type=Application 8.7 Name=Retawq Web browser 8.8 +Name[de]=Retawq Internet-Browser 8.9 +Name[es]=Retawq Navegador 8.10 Name[fr]=Retawq Navigateur Web 8.11 -Exec=xterm -e retawq 8.12 +Name[pt_BR]=Retawq navegador 8.13 +Name[ru]=Консольный браузер retawq 8.14 +Exec=terminal -e retawq 8.15 Icon=internet-web-browser 8.16 -Type=Application 8.17 -Categories=Network; 8.18 +Categories=ConsoleOnly;Network;WebBrowser;
9.1 --- a/retawq/stuff/skel/.retawq/config Wed Jul 31 14:12:39 2013 +0300 9.2 +++ b/retawq/stuff/skel/.retawq/config Wed Jul 31 20:21:51 2013 +0300 9.3 @@ -13,7 +13,7 @@ 9.4 # Our home page, you can set this value to off: 9.5 home http://www.slitaz.org/ 9.6 9.7 -# Our favorite search engine. 9.8 +# Our favorite search engine http://duckduckgo.com/?t=slitaz (needs SSL support) 9.9 search-engine http://www.google.com/ 9.10 9.11 # When downloading something from an HTTP server, we prefer the French
10.1 --- a/slitaz-i18n/stuff/locale-pack.conf Wed Jul 31 14:12:39 2013 +0300 10.2 +++ b/slitaz-i18n/stuff/locale-pack.conf Wed Jul 31 20:21:51 2013 +0300 10.3 @@ -2,8 +2,8 @@ 10.4 # Packages LC_MESSAGES included in the locale pack. 10.5 CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs epdfview \ 10.6 galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \ 10.7 -gtk+ isomaster kbd-base leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ 10.8 -lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted pcmanfm \ 10.9 +gtk+ isomaster kbd leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ 10.10 +lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted spacefm \ 10.11 popt retawq sakura transmission viewnior yad" 10.12 10.13 # List of all locale pack (locale-xx)