wok-4.x rev 8007

Merge
author Antoine Bodin <gokhlayeh@slitaz.org>
date Tue Jan 18 23:35:15 2011 +0100 (2011-01-18)
parents a296570a1223 97b93f51e35b
children d8afcddcae3c
files
line diff
     1.1 --- a/file/receipt	Tue Jan 18 19:08:18 2011 +0100
     1.2 +++ b/file/receipt	Tue Jan 18 23:35:15 2011 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="file"
     1.7 -VERSION="5.04"
     1.8 +VERSION="5.05"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Retrieve file type."
    1.11  MAINTAINER="erjo@slitaz.org"
     2.1 --- a/libmagic-dev/receipt	Tue Jan 18 19:08:18 2011 +0100
     2.2 +++ b/libmagic-dev/receipt	Tue Jan 18 23:35:15 2011 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libmagic-dev"
     2.7 -VERSION="5.04"
     2.8 +VERSION="5.05"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="Library for File utility dev files"
    2.11  MAINTAINER="erjo@slitaz.org"
     3.1 --- a/libmagic/receipt	Tue Jan 18 19:08:18 2011 +0100
     3.2 +++ b/libmagic/receipt	Tue Jan 18 23:35:15 2011 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libmagic"
     3.7 -VERSION="5.04"
     3.8 +VERSION="5.05"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Library for File utility"
    3.11  MAINTAINER="erjo@slitaz.org"
     4.1 --- a/tazchroot/receipt	Tue Jan 18 19:08:18 2011 +0100
     4.2 +++ b/tazchroot/receipt	Tue Jan 18 23:35:15 2011 +0100
     4.3 @@ -5,6 +5,7 @@
     4.4  CATEGORY="base-system"
     4.5  SHORT_DESC="Slitaz tool to manage chroot"
     4.6  MAINTAINER="gokhlayeh@slitaz.org"
     4.7 +DEPENDS="libtaz"
     4.8  TARBALL="$PACKAGE-$VERSION.tar.gz"
     4.9  WEB_SITE="http://www.slitaz.org/"
    4.10  #WGET_URL="http://mirror.slitaz.org/sources/base-files/$TARBALL"
     5.1 --- a/virtualbox-ose/receipt	Tue Jan 18 19:08:18 2011 +0100
     5.2 +++ b/virtualbox-ose/receipt	Tue Jan 18 23:35:15 2011 +0100
     5.3 @@ -44,7 +44,8 @@
     5.4  
     5.5  	source $src/env.sh
     5.6  	cd $src/out/linux.$BUILD_PLATFORM_ARCH/release/bin
     5.7 -	mkdir -p "$fs"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
     5.8 +	mkdir -p $fs/usr/bin $fs/usr/lib/virtualbox/components \
     5.9 +			$fs/usr/share/virtualbox/nls
    5.10  	cp -a VBox.sh $fs/usr/bin/VBox
    5.11  	sed -i 's/ps -U/ps | grep/' $fs/usr/bin/VBox
    5.12  	ln -sf VBox $fs/usr/bin/VBoxHeadless
    5.13 @@ -87,15 +88,15 @@
    5.14  	"$fs/etc/udev/rules.d/60-virtualbox.rules"
    5.15  
    5.16  	mkdir -p $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/
    5.17 -	pushd sdk/installer
    5.18 +	cd sdk/installer
    5.19  	VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install --root "$fs"
    5.20 -	popd
    5.21 -	pushd sdk/bindings/xpcom/python
    5.22 +	cd $src
    5.23 +	cd sdk/bindings/xpcom/python
    5.24  	cp -r xpcom $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/
    5.25  	chmod 644 $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/*.py
    5.26  	chmod 644 $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/server/*.py
    5.27  	chmod 644 $fs/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/client/*.py
    5.28 -	popd
    5.29 +	cd $src
    5.30  
    5.31  	# virtualbox-modules
    5.32  	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`