Merge commit 'libreoffice-3.4.2.3'

Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk

1 files changed, 1 insertions, 8 deletions

diff --git a/download b/download
index a8ff2bf9ba42..1eee6ef7e664 100755
--- a/download
+++ b/download
@@ -199,14 +199,7 @@ if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then
         if [ ! -f "$TARFILE_LOCATION/$tarname.tar.bz2" ] ; then
 	    downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.bz2" ""
 	fi
-	if [ ! -d $lo_src_dir/$tarname ] ; then
-	    echo "Unpacking $tarname.tar.bz2..."
-	    tar -xf "$TARFILE_LOCATION/$tarname.tar.bz2" -C "$lo_src_dir"
-	fi
-	# create symlinks
-	for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d` ; do
-	    ln -sf "$dir" "$start_dir"
-	done
+	$start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.bz2
     done
 fi