# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1299284132 -3600
# Node ID 80924f9b7f989304aab9b239c920854faa22b563
# Parent  ae75a1adf8ca861e8197b2f34d6e1f52e832d077# Parent  de7c8bf6e8fc85ecd85fa05497a5eb5ea2f20579
Merge

diff -r ae75a1adf8ca -r 80924f9b7f98 boxbackup-client/receipt
--- a/boxbackup-client/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/boxbackup-client/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -19,9 +19,9 @@
 # Rules to gen a SliTaz package suitable for Tazpkg
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/${SOURCE}-$VERSION/parcels/boxbackup-${VERSION}-backup-client-linux-gnu
 	mkdir -p $fs/usr/bin
-	cp -a $_pkg/bb* $fs/usr/bin
+	cp -a $_pkg/boxbackup-${VERSION}-backup-client-linux-gnu/bb* $fs/usr/bin
+	rm -f $fs/usr/bin/*.*
 	mkdir -p $fs/etc/init.d
 	cp -a stuff/bbackupd $fs/etc/init.d
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 boxbackup-server/receipt
--- a/boxbackup-server/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/boxbackup-server/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -29,8 +29,9 @@
 	./configure --prefix=/usr $CONFIGURE_ARGS &&
 	make -j1 && {
 		mkdir -p $DESTDIR
-		cp -a parcels/boxbackup-${VERSION}-backup-server-linux-gnu/* $DESTDIR
-		rm -f $DESTDIR/*.*
+		cp -a parcels/boxbackup-${VERSION}-backup-client-linux-gnu $DESTDIR
+		cp -a parcels/boxbackup-${VERSION}-backup-server-linux-gnu $DESTDIR
+		rm -f $DESTDIR/boxbackup-${VERSION}-backup-server-linux-gnu/*.*
 	}
 }
 
@@ -38,8 +39,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $_pkg/bb* $fs/usr/bin
-	cp -a $_pkg/ra* $fs/usr/bin
+	cp -a $_pkg/boxbackup-${VERSION}-backup-server-linux-gnu/bb* $fs/usr/bin
+	cp -a $_pkg/boxbackup-${VERSION}-backup-server-linux-gnu/ra* $fs/usr/bin
 	mkdir -p $fs/etc/init.d
 	cp -a stuff/bbstored $fs/etc/init.d
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 centerim/receipt
--- a/centerim/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/centerim/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -17,7 +17,7 @@
 {
 	cd $src
 	mkdir -p $DESTDIR/usr
-	./configure --prefix=$DESTDIR/usr --infodir=/usr/share/info \
+	./configure --prefix=/usr --infodir=/usr/share/info \
 	--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
 	make install
diff -r ae75a1adf8ca -r 80924f9b7f98 elilo/receipt
--- a/elilo/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/elilo/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	make
+	make -j1
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r ae75a1adf8ca -r 80924f9b7f98 emacs-pkg-lua-mode/receipt
--- a/emacs-pkg-lua-mode/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/emacs-pkg-lua-mode/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -12,18 +12,24 @@
 WGET_URL="http://luaforge.net/frs/download.php/2724/$TARBALL"
 TAGS="emacs lua"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR
+	cp -a $src/*.el $DESTDIR/
+}
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	echo -n "Installing lua-mode"
 	mkdir -p $fs/usr/share/emacs/site-lisp/lua-mode && \
-	cp $WOK/$PACKAGE/*.el $fs/usr/share/emacs/site-lisp/lua-mode
+	cp $_pkg/*.el $fs/usr/share/emacs/site-lisp/lua-mode
 	status
 
 	echo -n "Installing start file"
 	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d && \
-	cp stuff/*.el $fs/usr/share/emacs/site-lisp/site-start.d
+	cp $stuff/*.el $fs/usr/share/emacs/site-lisp/site-start.d
 	status
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 esmart/receipt
--- a/esmart/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/esmart/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="cairo evas ecore embryo edje imlib2 libtool xorg-libXss libcurl \
 xorg-libXp libgpg-error xorg-libXtst libtasn1"
-BUILD_DEPENDS="cairo-dev evas-dev"
+BUILD_DEPENDS="cairo-dev evas-dev subversion"
 WEB_SITE="http://www.enlightenment.org/"
 WGET_URL="subversion|http://svn.enlightenment.org/svn/e/OLD/$PACKAGE"
 BRANCH="$VERSION"
diff -r ae75a1adf8ca -r 80924f9b7f98 exif/receipt
--- a/exif/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/exif/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="exif"
-VERSION="0.6.17"
+VERSION="0.6.20"
 CATEGORY="graphics"
 SHORT_DESC="Read exif data from images"
 MAINTAINER="sygne@ombres.eu"
diff -r ae75a1adf8ca -r 80924f9b7f98 fcitx-zm/receipt
--- a/fcitx-zm/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/fcitx-zm/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -13,18 +13,19 @@
 compile_rules()
 {
 	echo -n "Remove All Words,Remained Hanzi only"
-#	mkdir stuff
-	mb2txt $SOURCES_REPOSITORY/zm.mb | awk 'NR<=10{print} NR>10{if(length($2)==3)print}' > stuff/zm.txt
-	cd stuff && txt2mb zm.txt zm.mb
-	cd ..
-	status
+	mkdir $DESTDIR
+	cd $DESTDIR
+	[ -s $SOURCES_REPOSITORY/zm.mb ] || wget -P $SOURCES_REPOSITORY $WGET_URL || return 1
+	cp $stuff/zm.conf .
+	mb2txt $SOURCES_REPOSITORY/zm.mb | awk 'NR<=10{print} NR>10{if(length($2)==3)print}' > zm.txt
+	txt2mb zm.txt zm.mb
+}
 
-}
 genpkg_rules()
 {
 	EXTDIR="$fs/usr/share/fcitx/data/table"
 	mkdir -p $EXTDIR
-	cp stuff/zm.mb $EXTDIR	
-	cp stuff/zm.conf $EXTDIR
+	cp $_pkg/zm.mb $EXTDIR	
+	cp $_pkg/zm.conf $EXTDIR
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 firefox-dev/receipt
--- a/firefox-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/firefox-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-dev"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="development"
 SHORT_DESC="firefox devel files"
 MAINTAINER="jozee@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 firefox-langpack-fr/receipt
--- a/firefox-langpack-fr/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/firefox-langpack-fr/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-fr"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="network"
 SHORT_DESC="France Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
diff -r ae75a1adf8ca -r 80924f9b7f98 firefox-langpack-zh_CN/receipt
--- a/firefox-langpack-zh_CN/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/firefox-langpack-zh_CN/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-zh_CN"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="network"
 SHORT_DESC="Chinese Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
diff -r ae75a1adf8ca -r 80924f9b7f98 firefox-langpack-zh_TW/receipt
--- a/firefox-langpack-zh_TW/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/firefox-langpack-zh_TW/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox-langpack-zh_TW"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="network"
 SHORT_DESC="Chinese Language Package for firefox"
 MAINTAINER="lufeng369@gmail.com"
diff -r ae75a1adf8ca -r 80924f9b7f98 firefox/receipt
--- a/firefox/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/firefox/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="network"
 SHORT_DESC="User friendly, secure and fast web browser."
 MAINTAINER="pankso@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 gavl-dev/receipt
--- a/gavl-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/gavl-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="gavl-dev"
-VERSION="1.1.1"
+VERSION="1.2.0"
 CATEGORY="development"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="gavl devel files"
 WEB_SITE="http://gmerlin.sourceforge.net/"
+DEPENDS="gavl"
 WANTED="gavl"
 
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r ae75a1adf8ca -r 80924f9b7f98 gavl/receipt
--- a/gavl/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/gavl/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="gavl"
-VERSION="1.1.1"
+VERSION="1.2.0"
 CATEGORY="multimedia"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="A low level library, upon which multimedia APIs can be built."
@@ -10,17 +10,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/gmerlin/$TARBALL"
 
-
 # Rules to configure and make the package.
-
 compile_rules() {
-  cd $src
-  ./configure --prefix=/usr  \
-			  --without-doxygen \
-			  --with-cpuflags=none \
-			  $CONFIGURE_ARGS &&
-  make &&
-  make DESTDIR=$PWD/_pkg install
+	cd $src
+	./configure --without-doxygen \
+		--with-cpuflags=none &&
+	make &&
+	make install
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r ae75a1adf8ca -r 80924f9b7f98 libfirefox/receipt
--- a/libfirefox/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/libfirefox/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libfirefox"
-VERSION="3.6.14"
+VERSION="3.6.15"
 CATEGORY="network"
 SHORT_DESC="firefox lib files"
 MAINTAINER="jozee@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 libsvn/receipt
--- a/libsvn/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/libsvn/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libsvn"
-VERSION="1.6.15"
+VERSION="1.6.16"
 CATEGORY="system-tools"
 SHORT_DESC="Subversion Source Code Management access"
 MAINTAINER="lehswe@gmail.com"
@@ -10,7 +10,6 @@
 WANTED="subversion"
 WEB_SITE="http://subversion.tigris.org"
 
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r ae75a1adf8ca -r 80924f9b7f98 mlt-dev/receipt
--- a/mlt-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/mlt-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mlt-dev"
-VERSION="0.6.0"
+VERSION="0.6.2"
 CATEGORY="development"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="mlt devel files"
diff -r ae75a1adf8ca -r 80924f9b7f98 mlt-python-bindings/receipt
--- a/mlt-python-bindings/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/mlt-python-bindings/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,31 +1,33 @@
 # SliTaz package receipt.
 
 PACKAGE="mlt-python-bindings"
-VERSION="0.6.0"
+VERSION="0.6.2"
 SOURCE="mlt"
 CATEGORY="multimedia"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="python bindings for MLT multimedia framework"
 WEB_SITE="http://www.mltframework.org"
 DEPENDS="python mlt"
-BUILD_DEPENDS="swig python mlt mlt-dev"
+BUILD_DEPENDS="swig"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mlt/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules() 
 {
-   cd $src/src/swig/python
-  ./build 
+	cd $src/src/swig/python
+	./build
+	PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
+	mkdir -p $DESTDIR/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/mlt.py $DESTDIR/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/_mlt.so $DESTDIR/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/mlt_wrap.o  $DESTDIR/usr/lib/python${PYTHON_VERSION}
  
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/python2.7/ 
-	cp -a $src/src/swig/python/mlt.py $fs/usr/lib/python2.7/ 
-	cp -a $src/src/swig/python/_mlt.so $fs/usr/lib/python2.7/
-	cp -a $src/src/swig/python/mlt_wrap.o  $fs/usr/lib/python2.7/ 
-	
+	mkdir -p $fs/usr
+	cp -a $_pkg/usr/lib $fs/usr
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 mlt/receipt
--- a/mlt/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/mlt/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,13 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="mlt"
-VERSION="0.6.0"
+VERSION="0.6.2"
 CATEGORY="multimedia"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="An open source multimedia framework"
 WEB_SITE="http://www.mltframework.org"
-DEPENDS="libsdl-image libsamplerate libdv qt4 sox libxml2 gtk+ ffmpeg-svn frei0r-plugins"
-BUILD_DEPENDS="libsamplerate-dev  libdv-dev  sox-dev Qt4-dev libxml2-dev  gtk+-dev  ffmpeg-svn-dev libsdl-image-dev frei0r-plugins-dev"
+DEPENDS="libsdl-image libsamplerate libdv qt4 sox libxml2 gtk+ ffmpeg frei0r-plugins"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="multimedia"
@@ -23,7 +22,7 @@
 			  --qimage-includedir=/usr/include/Qt \
 			  --avformat-swscale &&
   make &&
-  make DESTDIR=$PWD/_pkg install 
+  make install 
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r ae75a1adf8ca -r 80924f9b7f98 nagvis/receipt
--- a/nagvis/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/nagvis/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -63,7 +63,7 @@
 logonenvcreateuser="0"
 	}' $fs/etc/nagvis/nagvis.ini.php
 	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
-	sed -i -e 's/;showautomaps=1/showautomaps=0/"' $fs/etc/nagvis/nagvis.ini.php
+	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
 	
 	# Apache config
 	mv $fs/etc/nagvis/apache2-nagvis.conf-sample $fs/etc/nagvis/apache2-nagvis.conf
diff -r ae75a1adf8ca -r 80924f9b7f98 openerp-web/receipt
--- a/openerp-web/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/openerp-web/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -26,7 +26,7 @@
 {
 	mkdir -p $fs/usr $fs/etc/openerp $fs/usr/share/applications
 	cp -a stuff/etc $fs/
-	cp -a $_pkg/usr/config/default.cfg $fs/etc/openerp/openerp-web.conf
+	cp -a $_pkg/usr/config/openerp-web.cfg $fs/etc/openerp/openerp-web.conf
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 openmpi-dev/receipt
--- a/openmpi-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/openmpi-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -12,8 +12,10 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/${PACKAGE%-dev}
+	mkdir -p $fs/usr/lib/$WANTED
 	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/lib/${PACKAGE%-dev}/pkgconfig $fs/usr/lib/${PACKAGE%-dev}
+	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
+	cp -a $_pkg/usr/lib/$WANTED/*.*a $fs/usr/lib/$WANTED
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 openmpi/receipt
--- a/openmpi/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/openmpi/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -15,9 +15,7 @@
 compile_rules()
 {
 	cd $src
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${PACKAGE} \
-               --mandir=/usr/share/man \
+   ./configure --sysconfdir=/etc/${PACKAGE} \
                --enable-mpi-f90 \
                --libdir=/usr/lib/${pkgname} \
                --with-threads=posix \
@@ -28,19 +26,18 @@
                --without-slurm \
                --with-libltdl=/usr \
                FC=/usr/bin/gfortran \
-               LDFLAGS='-Wl,-z,noexecstack' \
-		$CONFIGURE_ARGS &&
-	make -j 4 && make DESTDIR=$PWD/_pkg install
+               LDFLAGS='-Wl,-z,noexecstack' &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/$PACKAGE/$PACKAGE
+	mkdir -p $fs/usr/lib/$PACKAGE
 	cp -a $_pkg/etc $fs
 	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
-	cp -a $_pkg/usr/lib/$PACKAGE/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE/$PACKAGE
-	cp -a $_pkg/usr/lib/$PACKAGE/mpi.mod $fs/usr/lib/$PACKAGE
+	cp -a $_pkg/usr/lib/mpi.mod $fs/usr/lib
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 openshot/receipt
--- a/openshot/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/openshot/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openshot"
-VERSION="1.2.2"
+VERSION="1.3.0"
 CATEGORY="multimedia"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="an open-source, non-linear video editor for Linux based on MLT framework"
@@ -10,7 +10,7 @@
 SUGGESTED="dvgrab libquicktime libavc1394 faac jack-audio-connection-kit ladspa"
 BUILD_DEPENDS="mlt-dev librsvg-dev libsdl-dev frei0r-plugins-dev sox-dev ffmpeg-dev goocanvas-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://launchpad.net/openshot/1.2/$VERSION/+download/$TARBALL"
+WGET_URL="http://launchpad.net/openshot/${VERSION%.*}/$VERSION/+download/$TARBALL"
 TAGS=""
 
 # Rules to configure and make the package.
diff -r ae75a1adf8ca -r 80924f9b7f98 php-auth-sasl/receipt
--- a/php-auth-sasl/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/php-auth-sasl/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -17,7 +17,7 @@
 {
 	cd $src
 	mkdir -p $DESTDIR/usr/share/php
-	tar czf $TARBALL $SOURCE-$VERSION
+	tar czf $TARBALL $SOURCE-$VERSION package.xml
 	pear install --offline --installroot=$DESTDIR $TARBALL
 }
 
@@ -25,7 +25,7 @@
 genpkg_rules()
 {
 	cp -a $_pkg/usr $fs
-	rm -rf $fs/usr/share/php/.channels $fs/usr/share/php/.registry/.*
+	rm -rf $fs/usr/share/php/.channels $fs/usr/share/php/.registry/.c*
 	rm -rf $fs/usr/share/php/.f* $fs/usr/share/php/.l*
 	rm -rf $fs/usr/share/php/.dep*
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 prboom/receipt
--- a/prboom/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/prboom/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -39,7 +39,7 @@
 	
 	echo "Downloading game data : doom1.wad"
 	[ -f $SOURCES_REPOSITORY/doom1.wad ] ||
-	wget http://people.slitaz.org/~mallory/stuff/prboom/doom1.wad -P $SOURCES_REPOSITORY
+	wget http://mirror.slitaz.org/sources/packages/d/doom1.wad -P $SOURCES_REPOSITORY
 	cp $SOURCES_REPOSITORY/doom1.wad $fs/usr/share/games/doom
 
 	echo "Copying metadata"
diff -r ae75a1adf8ca -r 80924f9b7f98 py3k-dev/receipt
--- a/py3k-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/py3k-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -13,8 +13,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $WOK/$WANTED/$SOURCE-$VERSION/_pkg/usr/include $fs/usr
-	cp -a $WOK/$WANTED/$SOURCE-$VERSION/_pkg/usr/bin/*-config $fs/usr/bin
+	cp -a $_pkg/usr/include $fs/usr
+	cp -a $_pkg/usr/bin/*-config $fs/usr/bin
 	chmod 755 $fs/usr/bin/*-config
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 python-nose/receipt
--- a/python-nose/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/python-nose/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -24,7 +24,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 radiusclient-ng/receipt
--- a/radiusclient-ng/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/radiusclient-ng/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -24,7 +24,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/usr/etc $_pkg/usr/sbin $fs/usr
+	cp -a $_pkg/etc $fs
+	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 }
 
diff -r ae75a1adf8ca -r 80924f9b7f98 slitaz-doc/receipt
--- a/slitaz-doc/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/slitaz-doc/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -29,7 +29,7 @@
 	chown -R root.root $fs/*
 	chmod -x $fs/usr/share/doc/slitaz/*.html
 	# Specific language doc is include in locale pack.
-	for i in "de fr hu pt"
+	for i in de fr hu pt
 	do
 		[ -d $WOK/locale-$i ] && tazwok cook locale-$i
 	done
diff -r ae75a1adf8ca -r 80924f9b7f98 subversion-dev/receipt
--- a/subversion-dev/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/subversion-dev/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="subversion-dev"
-VERSION="1.6.15"
+VERSION="1.6.16"
 CATEGORY="development"
 SHORT_DESC="Subversion Source Code Management accessdev files"
 MAINTAINER="lehswe@gmail.com"
diff -r ae75a1adf8ca -r 80924f9b7f98 subversion/receipt
--- a/subversion/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/subversion/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="subversion"
-VERSION="1.6.15"
+VERSION="1.6.16"
 CATEGORY="development"
 SHORT_DESC="Subversion Source Code Management access"
 MAINTAINER="lehswe@gmail.com"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-de/receipt
--- a/thunderbird-langpack-de/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-de/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-de"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-en_GB/receipt
--- a/thunderbird-langpack-en_GB/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-en_GB/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-en_GB"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-es_ES/receipt
--- a/thunderbird-langpack-es_ES/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-es_ES/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-es_ES"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-fr/receipt
--- a/thunderbird-langpack-fr/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-fr/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-fr"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-pt_BR/receipt
--- a/thunderbird-langpack-pt_BR/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-pt_BR/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-pt_BR"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-pt_PT/receipt
--- a/thunderbird-langpack-pt_PT/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-pt_PT/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-pt_PT"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird-langpack-ru/receipt
--- a/thunderbird-langpack-ru/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird-langpack-ru/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird-langpack-ru"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="locale for mozilla thunderbird"
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 thunderbird/receipt
--- a/thunderbird/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/thunderbird/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="thunderbird"
-VERSION="3.1.8"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="Mozilla's Thunderbird email application."
 MAINTAINER="domcox@slitaz.org"
diff -r ae75a1adf8ca -r 80924f9b7f98 virtualbox-ose/receipt
--- a/virtualbox-ose/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/virtualbox-ose/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -73,7 +73,8 @@
 	install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl  "$fs/usr/lib/virtualbox"
 	
 	#other binaries
-	install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest "$fs/usr/lib/virtualbox"
+	#install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest "$fs/usr/lib/virtualbox"
+	install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL "$fs/usr/lib/virtualbox"
 
 	#language
 	install -m 0755 nls/*.qm "$fs/usr/share/virtualbox/nls"
diff -r ae75a1adf8ca -r 80924f9b7f98 wqy-bitmapfont/receipt
--- a/wqy-bitmapfont/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/wqy-bitmapfont/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -10,10 +10,17 @@
 WGET_URL="$SF_MIRROR/wqy/$TARBALL"
 TAGS="fonts"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR
+	cp -a $src/* $DESTDIR
+}
+
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/fonts/wqy/wqy-bitmapfont/
-	cp -a wqy-bitmapfont/*.pcf $fs/usr/share/fonts/wqy/wqy-bitmapfont/
+	cp -a $_pkg/*.pcf $fs/usr/share/fonts/wqy/wqy-bitmapfont/
 }
 
 pre_install()
diff -r ae75a1adf8ca -r 80924f9b7f98 wqy-microhei/receipt
--- a/wqy-microhei/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/wqy-microhei/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -10,9 +10,16 @@
 WEB_SITE="http://wenq.org/index.cgi?MicroHei"
 WGET_URL="$SF_MIRROR/wqy/$TARBALL"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR
+	cp -a $src/* $DESTDIR
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
         mkdir -p $fs/usr/share/fonts/truetype/WenQuanYi
-        cp -a $PACKAGE/*.ttc $fs/usr/share/fonts/truetype/WenQuanYi
+        cp -a $_pkg/*.ttc $fs/usr/share/fonts/truetype/WenQuanYi
 }
diff -r ae75a1adf8ca -r 80924f9b7f98 xfce4-icon-theme/receipt
--- a/xfce4-icon-theme/receipt	Fri Mar 04 15:13:57 2011 +0100
+++ b/xfce4-icon-theme/receipt	Sat Mar 05 01:15:32 2011 +0100
@@ -24,7 +24,7 @@
 genpkg_rules()
 {
 		# Remove SVG Icons
-	find $_pkg/usr/share -name "*scalable*" -exec rm -rf {} \;
+	#find $_pkg/usr/share -name "*scalable*" -exec rm -rf {} \;
 	
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/share $fs/usr