# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1299250653 -3600
# Node ID 2969b58a89c1007adcfd6088b7a907f7a9651674
# Parent  b7bcf8431c9c03ab50b542a4b389c57f5418b336# Parent  0bc0cd627417ce270bf8c86965e4baa18da0ffc7
Merge changes from default into 4.3

diff -r b7bcf8431c9c -r 2969b58a89c1 tazpkg
--- a/tazpkg	Fri Mar 04 03:35:58 2011 +0100
+++ b/tazpkg	Fri Mar 04 15:57:33 2011 +0100
@@ -41,14 +41,15 @@
 # Initialize some variables to use words rather than numbers for functions
 # and actions.
 COMMAND=$1
-if [ -f "$2" ]; then
+PACKAGE=${2%/}
+PACKAGE_FILE="$PWD/$PACKAGE"
+if [ -f "$PACKAGE" ]; then
 	# Set pkg basename for install, extract
-	PACKAGE=$(basename ${2%.tazpkg} 2>/dev/null)
+	PACKAGE=$(basename ${PACKAGE%.tazpkg} 2>/dev/null)
 else
 	# Pkg name for remove, search and all other cmds
-	PACKAGE=${2%.tazpkg}
+	PACKAGE=${PACKAGE%.tazpkg}
 fi
-PACKAGE_FILE="$PWD/$2"
 TARGET_DIR=$3
 TOP_DIR=`pwd`
 TMP_DIR=$tmp/$RANDOM
@@ -1915,7 +1916,7 @@
 			    do
 				for mod in `cat $ROOT$INSTALLED/$PACKAGE/modifiers`
 				do
-					[ $(grep "^$(echo $file | grepesc)$" $ROOT$INSTALLED/$mod/files.list | wc -l) -gt 1 ] && continue 2
+					[ -f $ROOT$INSTALLED/$mod/files.list ] && [ $(grep "^$(echo $file | grepesc)$" $ROOT$INSTALLED/$mod/files.list | wc -l) -gt 1 ] && continue 2
 				done
 				remove_with_path $ROOT$file
 			    done
@@ -2872,6 +2873,10 @@
 	convert)
 		# convert misc package format to .tazpkg
 		check_for_package_file
+		if [ "$(dd if=$PACKAGE_FILE bs=8 count=1 skip=1 2> /dev/null)" \
+		      == "debian-b" ]; then
+			convert_deb
+		else
 		case "$PACKAGE_FILE" in
 		*.deb|*.udeb)
 			convert_deb;;
@@ -2885,7 +2890,8 @@
 			convert_ipk;;
 		*)
 			gettext "Unsupported format"; echo ;;
-		esac ;;
+		esac
+		fi ;;
 	link)
 		# link a package from another slitaz installation
 		PACKAGE=$2