# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1283869050 0
# Node ID bfee56f0dd1ec863dc13971abf587e9cde8c1ff9
# Parent  1ddb9a566a1ea804afe17b3d114b8de5689469c2# Parent  a62387bb254ea523f984fb6a12098feb39302c8c
merge

diff -r 1ddb9a566a1e -r bfee56f0dd1e cd-discid/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cd-discid/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,27 @@
+# SliTaz package receipt.
+
+PACKAGE="cd-discid"
+VERSION="1.1"
+CATEGORY="multimedia"
+SHORT_DESC="Utility to get CDDB discid information from a CD-ROM disc"
+MAINTAINER="domcox@slitaz.org"
+DEPENDS=""
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="http://linukz.org/cd-discid.shtml"
+WGET_URL="http://linukz.org/download/$TARBALL"
+TAGS="audio cd cddb"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	make && make DESTDIR=$PWD/_pkg install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr
+	cp -a $_pkg/usr/bin $fs/usr
+}
+
diff -r 1ddb9a566a1e -r bfee56f0dd1e clucene-dev/receipt
--- a/clucene-dev/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/clucene-dev/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -16,6 +16,6 @@
 	mkdir -p $fs/usr/lib $fs/usr/include
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/CLucene $fs/usr/include
+	cp -a $_pkg/usr/lib/CLucene $fs/usr/lib
 }
 
diff -r 1ddb9a566a1e -r bfee56f0dd1e fbida/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbida/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,30 @@
+# SliTaz package receipt.
+
+PACKAGE="fbida"
+VERSION="2.07"
+CATEGORY="utilites"
+SHORT_DESC="A simple GTK+ disc burner"
+MAINTAINER="devl547@gmail.com"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+DEPENDS="libpng giflib tiff jpeg ttf-bitstream-vera libexif zlib \
+curl"
+BUILD_DEPENDS="libpng-dev giflib-dev tiff-dev jpeg-dev libexif-dev \
+zlib-dev curl-dev"
+WEB_SITE="http://linux.bytesex.org/fbida/"
+WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	make -j2
+	make DESTDIR=$PWD/_pkg install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr
+	cp -a $_pkg/usr/local/bin $fs/usr/
+}
+
diff -r 1ddb9a566a1e -r bfee56f0dd1e fbxkb/receipt
--- a/fbxkb/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/fbxkb/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="fbxkb"
 VERSION="0.6"
-CATEGORY="utilites"
+CATEGORY="utilities"
 SHORT_DESC="fbxkb is NETWM compliant keyboard indicator and switcher."
 MAINTAINER="devl547@gmail.com"
 TARBALL="$PACKAGE-$VERSION.tgz"
diff -r 1ddb9a566a1e -r bfee56f0dd1e get-google-earth/receipt
--- a/get-google-earth/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/get-google-earth/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -5,6 +5,7 @@
 CATEGORY="non-free"
 SHORT_DESC="Get Google Earth."
 MAINTAINER="pascal.bellard@slitaz.org"
+DEPENDS="bzip2 xfree86-base-fonts"
 WEB_SITE="http://earth.google.com/"
 TAGS="map visualization"
 
diff -r 1ddb9a566a1e -r bfee56f0dd1e lirc/receipt
--- a/lirc/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/lirc/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -28,6 +28,9 @@
 	sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
 	sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.in
 
+	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
+	sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/g" configure
+
 	./configure \
 		--prefix=/usr \
 		--with-x \
diff -r 1ddb9a566a1e -r bfee56f0dd1e rrdtool-dev/receipt
--- a/rrdtool-dev/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/rrdtool-dev/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rrdtool-dev"
-VERSION="1.3.2"
+VERSION="1.4.4"
 CATEGORY="development"
 SHORT_DESC="Data logging and graphing system for time series data, development file."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 1ddb9a566a1e -r bfee56f0dd1e rrdtool-doc/receipt
--- a/rrdtool-doc/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/rrdtool-doc/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rrdtool-doc"
-VERSION="1.3.2"
+VERSION="1.4.4"
 CATEGORY="development"
 SHORT_DESC="Data logging and graphing system for time series data."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 1ddb9a566a1e -r bfee56f0dd1e rrdtool-man/receipt
--- a/rrdtool-man/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/rrdtool-man/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rrdtool-man"
-VERSION="1.3.2"
+VERSION="1.4.4"
 CATEGORY="development"
 SHORT_DESC="Data logging and graphing system for time series data."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 1ddb9a566a1e -r bfee56f0dd1e rrdtool-perl/receipt
--- a/rrdtool-perl/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/rrdtool-perl/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rrdtool-perl"
-VERSION="1.3.2"
+VERSION="1.4.4"
 CATEGORY="development"
 SHORT_DESC="Perl bindings for rrdtool."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 1ddb9a566a1e -r bfee56f0dd1e rrdtool-python/receipt
--- a/rrdtool-python/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/rrdtool-python/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="rrdtool-python"
-VERSION="1.3.2"
+VERSION="1.4.4"
 CATEGORY="development"
 SHORT_DESC="Python bindings for rrdtool."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 1ddb9a566a1e -r bfee56f0dd1e rubyripper/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rubyripper/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,43 @@
+# SliTaz package receipt.
+
+PACKAGE="rubyripper"
+VERSION="0.6.0"
+CATEGORY="multimedia"
+SHORT_DESC="A secure audio disc ripper"
+MAINTAINER="domcox@slitaz.org"
+DEPENDS="cd-discid cdparanoia-III flac normalize ruby"
+SUGGESTED="ruby-gtk2 lame orgenc"
+BUILD_DEPENDS="cd-discid cdparanoia-III lame normalize ruby vorbis-tools"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WEB_SITE="http://code.google.com/p/rubyripper"
+WGET_URL="http://rubyripper.googlecode.com/files/$TARBALL"
+TAGS="audio cd ripper"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	./configure \
+		--prefix=/usr \
+		--enable-gtk2 \
+		--enable-cli \
+		--enable-lang-all \
+		&& make && make DESTDIR=$PWD/_pkg install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr 
+	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $_pkg/usr/lib $fs/usr
+	# desktop file
+	mkdir -p $fs/usr/share/applications
+	cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications
+	# icon
+	mkdir -p $fs/usr/share/pixmaps
+	cp -a stuff/$PACKAGE.png $fs/usr/share/pixmaps
+	# launcher
+	cp -a stuff/$PACKAGE $fs/usr/bin
+}
+
diff -r 1ddb9a566a1e -r bfee56f0dd1e rubyripper/stuff/rubyripper
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rubyripper/stuff/rubyripper	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#	Rubyripper launcher
+#	(C) 2007-2010 SliTaz - GNU General Public License v3. 
+
+RUBY_GTK2_PC=$(/usr/bin/pkg-config --exists ruby-gtk2)
+if [ $RUBY_GTK2_PC ]; then
+	/usr/bin/rrip_gui
+else
+	/usr/bin/xterm -T "Rubyripper CLI" -e /usr/bin/rrip_cli
+fi
diff -r 1ddb9a566a1e -r bfee56f0dd1e rubyripper/stuff/rubyripper.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rubyripper/stuff/rubyripper.desktop	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Rubyripper CD ripper
+Comment=A Secure Audio Disc Ripper
+Icon=rubyripper.png
+Exec=rubyripper
+Categories=Audio;AudioVideo;
diff -r 1ddb9a566a1e -r bfee56f0dd1e rubyripper/stuff/rubyripper.png
Binary file rubyripper/stuff/rubyripper.png has changed
diff -r 1ddb9a566a1e -r bfee56f0dd1e tazbb/stuff/tazbb
--- a/tazbb/stuff/tazbb	Tue Sep 07 14:16:20 2010 +0000
+++ b/tazbb/stuff/tazbb	Tue Sep 07 14:17:30 2010 +0000
@@ -29,7 +29,7 @@
 # Let tazbb finish is work and make sure needed files exist.
 if [ -f $LOCK_FILE ]; then
 	case $1 in
-		usage|list-*|*block)
+		usage|list-*|*block|check-receipt)
 			continue ;;
 		*)
 			echo -e "\nTazbb is already running and locked...\n"
@@ -567,11 +567,12 @@
 {
 	WANTED=""
 	. $BUILD_WOK/$1/receipt
-	if [ -n $WANTED ]; then
+	if [ -n "$WANTED" ]; then
 		expected=$VERSION
 		VERSION=
 		. $BUILD_WOK/$WANTED/receipt
 		if [ "$VERSION" != "$expected" ]; then
+			echo "$1: expected wanted version $expected, found $VERSION"
 			return 1
 		fi
 	fi
@@ -902,7 +903,6 @@
 	cd - > /dev/null
 }
 
-return_status=0
 case "$1" in
 	list-pkgs)
 		# List last cooked packages.
@@ -1020,7 +1020,7 @@
 		check_variables $2 &&
 		check_wanted_version $2 &&
 		check_build_depends $2 ""
-		return_status=$? ;;
+		exit $? ;;
 	check-depends)
 		case "$2" in
 		wok)
@@ -1057,4 +1057,4 @@
 echo "" > $DB_DIR/running
 rm -f $LOCK_FILE /tmp/files.list.tazbb$$
 
-exit $return_status
+exit 0
diff -r 1ddb9a566a1e -r bfee56f0dd1e thunderbird-langpack-en_GB/receipt
--- a/thunderbird-langpack-en_GB/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/thunderbird-langpack-en_GB/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -14,7 +14,7 @@
 compile_rules()
 {
 	cd $WOK/$PACKAGE
-	LANG=`echo $PACKAGE | cut -d'-' -f3`
+	LANG=`echo $PACKAGE | cut -d'-' -f3 |  tr '_' '-'`
 	# Get xpi
 	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
 	if [ -e $LANG.xpi ]; then
diff -r 1ddb9a566a1e -r bfee56f0dd1e thunderbird-langpack-es/receipt
--- a/thunderbird-langpack-es/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="thunderbird-langpack-es"
-VERSION="3.1.2"
-CATEGORY="network"
-SHORT_DESC="locale for mozilla thunderbird"
-MAINTAINER="domcox@slitaz.org"
-DEPENDS="thunderbird"
-SOURCE="thunderbird"
-WEB_SITE="www.mozillamessaging.com"
-
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $WOK/$PACKAGE
-	LANG=`echo $PACKAGE | cut -d'-' -f3`
-	# Get xpi
-	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
-	if [ -e $LANG.xpi ]; then
-		echo "Using current langpack ($LANG.xpi)"
-	else
-		echo "Downloading langpack ($LANG.xpi)"
-		wget $WGET_URL
-	fi
-	# Uncompress
-	echo -n "Uncompressing langpack ($LANG.xpi)"
-	LANG_DIR="langpack-$LANG@thunderbird.mozilla.org"
-	mkdir -p $LANG_DIR && unzip -oq $LANG.xpi -d $LANG_DIR
-	status
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions"
-	mkdir -p $EXTDIR
-	cp -a $LANG_DIR $EXTDIR
-}
diff -r 1ddb9a566a1e -r bfee56f0dd1e thunderbird-langpack-es_ES/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thunderbird-langpack-es_ES/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -0,0 +1,39 @@
+# SliTaz package receipt.
+
+PACKAGE="thunderbird-langpack-es_ES"
+VERSION="3.1.2"
+CATEGORY="network"
+SHORT_DESC="locale for mozilla thunderbird"
+MAINTAINER="domcox@slitaz.org"
+DEPENDS="thunderbird"
+SOURCE="thunderbird"
+WEB_SITE="www.mozillamessaging.com"
+
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $WOK/$PACKAGE
+	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
+	# Get xpi
+	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
+	if [ -e $LANG.xpi ]; then
+		echo "Using current langpack ($LANG.xpi)"
+	else
+		echo "Downloading langpack ($LANG.xpi)"
+		wget $WGET_URL
+	fi
+	# Uncompress
+	echo -n "Uncompressing langpack ($LANG.xpi)"
+	LANG_DIR="langpack-$LANG@thunderbird.mozilla.org"
+	mkdir -p $LANG_DIR && unzip -oq $LANG.xpi -d $LANG_DIR
+	status
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions"
+	mkdir -p $EXTDIR
+	cp -a $LANG_DIR $EXTDIR
+}
diff -r 1ddb9a566a1e -r bfee56f0dd1e thunderbird-langpack-pt_BR/receipt
--- a/thunderbird-langpack-pt_BR/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/thunderbird-langpack-pt_BR/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -14,7 +14,7 @@
 compile_rules()
 {
 	cd $WOK/$PACKAGE
-	LANG=`echo $PACKAGE | cut -d'-' -f3`
+	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
 	# Get xpi
 	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
 	if [ -e $LANG.xpi ]; then
diff -r 1ddb9a566a1e -r bfee56f0dd1e thunderbird-langpack-pt_PT/receipt
--- a/thunderbird-langpack-pt_PT/receipt	Tue Sep 07 14:16:20 2010 +0000
+++ b/thunderbird-langpack-pt_PT/receipt	Tue Sep 07 14:17:30 2010 +0000
@@ -14,7 +14,7 @@
 compile_rules()
 {
 	cd $WOK/$PACKAGE
-	LANG=`echo $PACKAGE | cut -d'-' -f3`
+	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
 	# Get xpi
 	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
 	if [ -e $LANG.xpi ]; then