# HG changeset patch # User Aleksej Bobylev # Date 1449325020 -7200 # Node ID 86d61e11027469706e2682b4ec00a6488a8da25f # Parent 857cceeac4041bcdcb94b7c40ad92485ed695e35 Up tazpkg(884); avant-window-navigator: update receipt; continue with pre/post... functions diff -r 857cceeac404 -r 86d61e110274 avant-window-navigator/receipt --- a/avant-window-navigator/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/avant-window-navigator/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -11,19 +11,17 @@ WGET_URL="http://launchpad.net/awn/${VERSION%.*}/$VERSION/+download/$TARBALL" TAGS="panel" -DEPENDS="acl dbus dbus-glib librsvg libwnck xorg-xcompmgr libgtop \ +DEPENDS="acl dbus-glib librsvg libwnck xorg-xcompmgr libgtop \ libdesktop-agnostic" -BUILD_DEPENDS="dbus-dev librsvg-dev libwnck-dev pygtk-dev xcb-util-dev \ -libxcb-dev startup-notification-dev pycairo-dev pygobject-dev libffi-dev \ -python-xdg intltool acl-dev dbus-dev dbus-glib-dev python-dev \ -libdesktop-agnostic-dev libgtop-dev GConf-dev" +BUILD_DEPENDS="librsvg-dev libwnck-dev pygtk-dev python-xdg intltool \ +dbus-glib-dev python-dev libdesktop-agnostic-dev libgtop-dev GConf-dev" # Rules to configure and make the package. compile_rules() { # Binutils 2.22 break many packages build without LDFLAGS set correctly. export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" - + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -41,33 +39,12 @@ cp -a $install/usr/lib/*.so* $fs/usr/lib cp -a $install/usr/share/$PACKAGE $fs/usr/share cp -a $install/usr/share/applications $fs/usr/share - cp -a $install/usr/share/icons/hicolor/32x32/apps \ - $fs/usr/share/pixmaps + cp -a $install/usr/share/icons $fs/usr/share # Custom autostart script so we ensure xcompmgr is also started. cat > $fs/usr/bin/awn-autostart << _EOT_ #!/bin/sh xcompmgr & -sleep 4 && avant-window-navigator +sleep 4 +avant-window-navigator _EOT_ - - # split awn-manager - rm -f $fs/usr/bin/awn-manager - rm -rf $fs/usr/share/$PACKAGE/awn-manager - rm -f $fs/usr/share/applications/awn-manager.desktop - - # fix permissions - chmod +x $fs/usr/bin/* - - # Fix missing icon - cd $fs/usr/share/pixmaps - ln -s avant-window-navigator.png awn-manager.png - - } - -post_install() -{ - # ln missing icons - ln -sf go-up.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-ascending.png - ln -sf go-down.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-descending.png -} diff -r 857cceeac404 -r 86d61e110274 bridge-utils/receipt --- a/bridge-utils/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/bridge-utils/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -6,18 +6,17 @@ SHORT_DESC="IEEE 802.1d ethernet bridging" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" -TARBALL="${PACKAGE}-${VERSION}.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" WGET_URL="$SF_MIRROR/bridge/$TARBALL" TAGS="ethernet bridge" -BUILD_DEPENDS="autoconf automake" +BUILD_DEPENDS="automake" # Rules to configure and make the package. compile_rules() { - cd $src - autoconf + autoconf ./configure --prefix=/usr && make && make DESTDIR=$DESTDIR install } @@ -29,13 +28,7 @@ cp -a $install/usr/sbin $fs/usr } -# Overlap busybox -pre_install() -{ - rm -f $1/usr/sbin/brctl -} - post_remove() { - ln -s /bin/busybox $1/usr/sbin/brctl + ln -s /bin/busybox "$1/usr/sbin/brctl" } diff -r 857cceeac404 -r 86d61e110274 broadcom-wl/receipt --- a/broadcom-wl/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/broadcom-wl/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -37,12 +37,10 @@ # Post install/remove commands for Tazpkg. post_install() { - echo "Processing post-install commands..." - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz } post_remove() { - echo "Processing post-remove commands..." - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz } diff -r 857cceeac404 -r 86d61e110274 brscan/receipt --- a/brscan/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/brscan/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -71,10 +71,10 @@ # Pre and post install and remove commands for Tazpkg. post_install() { - chroot $1/ /usr/local/Brother/sane/setupSaneScan -i + chroot "$1/" /usr/local/Brother/sane/setupSaneScan -i } pre_remove() { - chroot $1/ /usr/local/Brother/sane/setupSaneScan -e + chroot "$1/" /usr/local/Brother/sane/setupSaneScan -e } diff -r 857cceeac404 -r 86d61e110274 brscan2/receipt --- a/brscan2/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/brscan2/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -70,10 +70,10 @@ # Pre and post install and remove commands for Tazpkg. post_install() { - chroot $1/ /usr/local/Brother/sane/setupSaneScan2 -i + chroot "$1/" /usr/local/Brother/sane/setupSaneScan2 -i } pre_remove() { - chroot $1/ /usr/local/Brother/sane/setupSaneScan2 -e + chroot "$1/" /usr/local/Brother/sane/setupSaneScan2 -e } diff -r 857cceeac404 -r 86d61e110274 tazpkg/receipt --- a/tazpkg/receipt Sat Dec 05 12:23:18 2015 +0100 +++ b/tazpkg/receipt Sat Dec 05 16:17:00 2015 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazpkg" -VERSION="883" +VERSION="884" CATEGORY="base-system" SHORT_DESC="SliTaz packages manager" MAINTAINER="pankso@slitaz.org"