# HG changeset patch # User Aleksej Bobylev # Date 1375445621 -10800 # Node ID 4434891fab1c85874c390e3ce0892979cb79aca9 # Parent 153f3ed96c2df871e801743504cc7ce52132b009 lxinput: up 0.3.2; openbox: fix pipe menu display; slitaz-i18n: add missing core packages; tiny edits. diff -r 153f3ed96c2d -r 4434891fab1c locale-cs/receipt --- a/locale-cs/receipt Wed Jul 31 21:06:55 2013 +0200 +++ b/locale-cs/receipt Fri Aug 02 15:13:41 2013 +0300 @@ -5,10 +5,11 @@ CATEGORY="system-tools" SHORT_DESC="Czech locale pack." MAINTAINER="pankso@slitaz.org" +WEB_SITE="http://www.slitaz.org/" + +WANTED="slitaz-i18n" DEPENDS="glibc-base" BUILD_DEPENDS="glibc glibc-locale slitaz-i18n" -WEB_SITE="http://www.slitaz.org/" -WANTED="slitaz-i18n" LOCALE="cs" LOCALEDEF="cs_CZ" diff -r 153f3ed96c2d -r 4434891fab1c lxde/stuff/lxde-logout.desktop --- a/lxde/stuff/lxde-logout.desktop Wed Jul 31 21:06:55 2013 +0200 +++ b/lxde/stuff/lxde-logout.desktop Fri Aug 02 15:13:41 2013 +0300 @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application -Icon=slitaz-logout -Exec=lxde-logout Name=LXSession Log Out Name[fr]=Déconnexion de LXSession Name[it]=Esci LXSession Name[pt_BR]=Encerrar LXSessão -Name[ru]=Выйти LXSession +Name[ru]=Завершить сеанс +Exec=lxde-logout +Icon=slitaz-logout Categories=System; OnlyShowIn=LXDE; diff -r 153f3ed96c2d -r 4434891fab1c lxde/stuff/xsessions/LXDE.desktop --- a/lxde/stuff/xsessions/LXDE.desktop Wed Jul 31 21:06:55 2013 +0200 +++ b/lxde/stuff/xsessions/LXDE.desktop Fri Aug 02 15:13:41 2013 +0300 @@ -3,4 +3,5 @@ Type=XSession Name=LXDE Desktop Name[fr]=Bureau LXDE +Name[ru]=Рабочий стол LXDE Exec=lxde-session diff -r 153f3ed96c2d -r 4434891fab1c lxinput/receipt --- a/lxinput/receipt Wed Jul 31 21:06:55 2013 +0200 +++ b/lxinput/receipt Fri Aug 02 15:13:41 2013 +0300 @@ -1,13 +1,14 @@ # SliTaz package receipt. PACKAGE="lxinput" -VERSION="0.3.1" +VERSION="0.3.2" CATEGORY="x-window" SHORT_DESC="LXDE input manager (Keyboard and mouse settings)." MAINTAINER="pankso@slitaz.org" +LICENSE="GPL3" +WEB_SITE="http://lxde.org" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/lxde/LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/LXInput%20${VERSION}/$TARBALL" -WEB_SITE="http://lxde.org" DEPENDS="gtk+" BUILD_DEPENDS="gtk+-dev" @@ -15,7 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ $CONFIGURE_ARGS && make && make install diff -r 153f3ed96c2d -r 4434891fab1c lxsession-edit/receipt --- a/lxsession-edit/receipt Wed Jul 31 21:06:55 2013 +0200 +++ b/lxsession-edit/receipt Fri Aug 02 15:13:41 2013 +0300 @@ -5,9 +5,10 @@ CATEGORY="x-window" SHORT_DESC="LXDE X session manager editor." MAINTAINER="pankso@slitaz.org" +LICENSE="GPL2" +WEB_SITE="http://wiki.lxde.org/en/LXSession_Edit" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/lxde/LXSession%20Edit/lxsession-edit%20$VERSION/$TARBALL" -WEB_SITE="http://wiki.lxde.org/en/LXSession_Edit" DEPENDS="gtk+ lxsession" BUILD_DEPENDS="gtk+-dev" @@ -15,7 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --sysconfdir=/etc \ $CONFIGURE_ARGS && diff -r 153f3ed96c2d -r 4434891fab1c lxsession/receipt --- a/lxsession/receipt Wed Jul 31 21:06:55 2013 +0200 +++ b/lxsession/receipt Fri Aug 02 15:13:41 2013 +0300 @@ -5,13 +5,16 @@ CATEGORY="x-window" SHORT_DESC="LXDE X session manager." MAINTAINER="pankso@slitaz.org" +LICENSE="GPL2" +WEB_SITE="http://wiki.lxde.org/en/LXSession" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/lxde/LXSession%20%28session%20manager%29/LXSession%200.4.6.1/$TARBALL" -WEB_SITE="http://wiki.lxde.org/en/LXSession" DEPENDS="gtk+ dbus" BUILD_DEPENDS="gtk+-dev dbus-dev" +# next lxsession-0.4.9.2 require gee-1.0 + # Rules to configure and make the package. compile_rules() { diff -r 153f3ed96c2d -r 4434891fab1c openbox/stuff/open-folder-menu.sh --- a/openbox/stuff/open-folder-menu.sh Wed Jul 31 21:06:55 2013 +0200 +++ b/openbox/stuff/open-folder-menu.sh Fri Aug 02 15:13:41 2013 +0300 @@ -1,29 +1,23 @@ #!/bin/sh # -# Openbox pipe menu to launch SpaceFM using GTK bookmarks. +# Openbox pipe menu to launch file-manager using GTK bookmarks. # - echo '' -# Home -echo '' -echo '' -echo "spacefm ~" -echo '' +bookmarks="~ $(whoami) +~/Desktop $(gettext gtk20 Desktop) +$(cat ~/.gtk-bookmarks)" -# ~/Desktop -echo '' -echo '' -echo "spacefm ~/Desktop" -echo '' - -# GTK bookmarks -for dir in `sed 's/[ ][^ ]*$//' .gtk-bookmarks` -do - echo '' - echo '' - echo "spacefm $dir" - echo '' +IFS=' +' +for dir in $bookmarks; do + cat << EOT + + + file-manager $(echo $dir | awk '{print $1}') + + +EOT done echo '' diff -r 153f3ed96c2d -r 4434891fab1c slitaz-i18n/stuff/locale-pack.conf --- a/slitaz-i18n/stuff/locale-pack.conf Wed Jul 31 21:06:55 2013 +0200 +++ b/slitaz-i18n/stuff/locale-pack.conf Fri Aug 02 15:13:41 2013 +0300 @@ -4,7 +4,7 @@ galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \ 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" +popt retawq sakura transmission viewnior yad lxsession lxsession-edit lxinput" # List of all locale pack (locale-xx) LOCALE_PACK="cs da de el es fr hu id it pl pt pt_BR ru sl sv zh_CN zh_TW"