# HG changeset patch # User Aleksej Bobylev # Date 1375291311 -10800 # Node ID f1e7576310806b5a7cf8a7eb98fd0706c358832f # Parent c40da21aa3a1852645f1c02bb8cdc8982b5eddf8 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. diff -r c40da21aa3a1 -r f1e757631080 kbd-base/receipt --- a/kbd-base/receipt Wed Jul 31 14:12:39 2013 +0300 +++ b/kbd-base/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -1,15 +1,16 @@ # SliTaz package receipt. PACKAGE="kbd-base" -VERSION="1.15.3" +VERSION="1.15.5" CATEGORY="base-system" SHORT_DESC="Keyboard maping definitions and loadkeys utility." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WANTED="kbd" WEB_SITE="http://kbd-project.org/" HOST_ARCH="i486 arm" +WANTED="kbd" + # Make sure it will run on host or no keyboard support... testsuite() { @@ -21,21 +22,24 @@ { mkdir -p $fs/bin cp -a $install/usr/bin/loadkeys $fs/bin + # Dirs for dir in dvorak azerty qwerty qwertz; do mkdir -p $fs/usr/share/kbd/keymaps/i386/$dir 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 + # Include files cp -a $install/usr/share/kbd/keymaps/include \ $fs/usr/share/kbd/keymaps cp -a $install/usr/share/kbd/keymaps/i386/include \ $fs/usr/share/kbd/keymaps/i386/include + # X11 keyboard aliases while read X keymap ; do ln -s $keymap.map.gz $fs/usr/share/kbd/keymaps/i386/$X.map.gz @@ -43,4 +47,3 @@ qwertz/hr croat EOT } - diff -r c40da21aa3a1 -r f1e757631080 kbd-busybox/receipt --- a/kbd-busybox/receipt Wed Jul 31 14:12:39 2013 +0300 +++ b/kbd-busybox/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -1,25 +1,25 @@ # SliTaz package receipt. PACKAGE="kbd-busybox" -VERSION="1.15.3" +VERSION="1.15.5" CATEGORY="base-system" SHORT_DESC="Keyboard maping definitions for busybox." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.slitaz.org/" + BUILD_DEPENDS="kbd-base busybox" -WEB_SITE="http://www.slitaz.org/" # Rules to configure and make the package. compile_rules() { mkdir -p $install/usr/share/kmap - cd $src dumpkmap > current.kmap || return 1 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 /usr/share/kbd/keymaps/i386/$i && + loadkeys -u /usr/share/kbd/keymaps/i386/$i && dumpkmap > $install/usr/share/kmap/$k.kmap dumpkmap | cmp current.kmap - > /dev/null && map=$i done @@ -31,4 +31,3 @@ { cp -a $install/usr $fs } - diff -r c40da21aa3a1 -r f1e757631080 kbd-vlock/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kbd-vlock/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="kbd-vlock" +VERSION="1.15.5" +CATEGORY="system-tools" +SHORT_DESC="vlock - Virtual Console lock program" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="GPL2" +WEB_SITE="http://kbd-project.org/" +TAGS="console" + +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 +} diff -r c40da21aa3a1 -r f1e757631080 kbd/receipt --- a/kbd/receipt Wed Jul 31 14:12:39 2013 +0300 +++ b/kbd/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -1,26 +1,29 @@ # SliTaz package receipt. PACKAGE="kbd" -VERSION="1.15.3" +VERSION="1.15.5" CATEGORY="system-tools" SHORT_DESC="Keyboard maping definitions and tools." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://kbd-project.org/" -WGET_URL="http://kbd-project.org/download/$TARBALL" +#WGET_URL="http://kbd-project.org/download/$TARBALL" +WGET_URL="ftp://ftp.altlinux.org/pub/people/legion/kbd/$TARBALL" TAGS="keyboard" HOST_ARCH="i486 arm" -#BUILD_DEPENDS="flex" +DEPENDS="kbd-base" +BUILD_DEPENDS="flex pam-dev" # Rules to configure and make the package. compile_rules() { - cd $src - patch -Np1 -i $stuff/fix-es.po.patch + # standard locale placement + sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in ./configure \ --datadir=/usr/share/kbd \ + --localedir=/usr/share/locale \ $CONFIGURE_ARGS && make && make install } @@ -30,13 +33,19 @@ { mkdir -p $fs/usr/share - # Copy all kbd files (should we split fonts ?) and remove the one - # provided by: kbd-base. - cp -a $_pkg/usr/share/kbd $fs/usr/share - rm -rf $fs/usr/share/kbd/keymaps/i386 + # Copy all kbd files (should we split fonts?) + cp -a $install/usr/share/kbd $fs/usr/share # Tools 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 + 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 $fs/usr/bin/vlock } # Overlap busybox diff -r c40da21aa3a1 -r f1e757631080 kbd/stuff/fix-es.po.patch --- a/kbd/stuff/fix-es.po.patch Wed Jul 31 14:12:39 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 -+++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 -@@ -1363,7 +1363,7 @@ - #: src/setfont.c:682 - #, c-format - msgid "Saved %d-char %dx%d font file on %s\n" --msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" -+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" - - #: src/setkeycodes.c:21 - #, c-format diff -r c40da21aa3a1 -r f1e757631080 locale-pl/receipt --- a/locale-pl/receipt Wed Jul 31 14:12:39 2013 +0300 +++ b/locale-pl/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -23,7 +23,7 @@ mk_locale_dir get_slitaz_messages get_core_messages - get_x11_locale + #get_x11_locale } # Back to C if it's the last used locale. diff -r c40da21aa3a1 -r f1e757631080 retawq/receipt --- a/retawq/receipt Wed Jul 31 14:12:39 2013 +0300 +++ b/retawq/receipt Wed Jul 31 20:21:51 2013 +0300 @@ -5,6 +5,7 @@ CATEGORY="network" SHORT_DESC="Text mode Web browser." MAINTAINER="pankso@slitaz.org" +LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://retawq.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" @@ -43,12 +44,10 @@ mkdir -p $fs/etc $fs/usr/bin cp -a $src/retawq $fs/usr/bin cp -a $stuff/skel $fs/etc - # I18n - for lang in $LOCALE; do - if [ -f "$src/i18n/$lang.mo" ]; then - mkdir -p $fs/usr/share/locale/$lang/LC_MESSAGES - cp $src/i18n/$lang.mo \ - $fs/usr/share/locale/$lang/LC_MESSAGES/retawq.mo - fi + # I18n for locale-* packages + for lang in de es fr ja pt_BR; do + mkdir -p $install/usr/share/locale/$lang/LC_MESSAGES + cp $src/i18n/$lang.mo \ + $install/usr/share/locale/$lang/LC_MESSAGES/retawq.mo done } diff -r c40da21aa3a1 -r f1e757631080 retawq/stuff/retawq.desktop --- a/retawq/stuff/retawq.desktop Wed Jul 31 14:12:39 2013 +0300 +++ b/retawq/stuff/retawq.desktop Wed Jul 31 20:21:51 2013 +0300 @@ -1,8 +1,11 @@ [Desktop Entry] -Encoding=UTF-8 +Type=Application Name=Retawq Web browser +Name[de]=Retawq Internet-Browser +Name[es]=Retawq Navegador Name[fr]=Retawq Navigateur Web -Exec=xterm -e retawq +Name[pt_BR]=Retawq navegador +Name[ru]=Консольный браузер retawq +Exec=terminal -e retawq Icon=internet-web-browser -Type=Application -Categories=Network; +Categories=ConsoleOnly;Network;WebBrowser; diff -r c40da21aa3a1 -r f1e757631080 retawq/stuff/skel/.retawq/config --- a/retawq/stuff/skel/.retawq/config Wed Jul 31 14:12:39 2013 +0300 +++ b/retawq/stuff/skel/.retawq/config Wed Jul 31 20:21:51 2013 +0300 @@ -13,7 +13,7 @@ # Our home page, you can set this value to off: home http://www.slitaz.org/ -# Our favorite search engine. +# Our favorite search engine http://duckduckgo.com/?t=slitaz (needs SSL support) search-engine http://www.google.com/ # When downloading something from an HTTP server, we prefer the French diff -r c40da21aa3a1 -r f1e757631080 slitaz-i18n/stuff/locale-pack.conf --- a/slitaz-i18n/stuff/locale-pack.conf Wed Jul 31 14:12:39 2013 +0300 +++ b/slitaz-i18n/stuff/locale-pack.conf Wed Jul 31 20:21:51 2013 +0300 @@ -2,8 +2,8 @@ # Packages LC_MESSAGES included in the locale pack. CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs epdfview \ galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \ -gtk+ isomaster kbd-base leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ -lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted pcmanfm \ +gtk+ isomaster kbd leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ +lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted spacefm \ popt retawq sakura transmission viewnior yad" # List of all locale pack (locale-xx)