3 files changed, 18 insertions, 12 deletions
diff --git a/data/buildscripts/build-gnulinux.sh b/data/buildscripts/build-gnulinux.sh
index a844af9..86e6199 100644
--- a/data/buildscripts/build-gnulinux.sh
+++ b/data/buildscripts/build-gnulinux.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
+set -x
 
 apt-get -q -y --force-yes build-dep firefox
+apt-get -q -y --force-yes install libgstreamermm-0.10-dev
 
 cp ../../data/buildscripts/mozconfig-common .mozconfig
 cat ../../data/buildscripts/mozconfig-gnulinux >> .mozconfig
@@ -14,7 +16,9 @@ rm -rf obj-gnulinux
 [ $(arch) = "x86_64" ] || exit 0
 cd obj-gnulinux/browser/locales
 for locale in $(ls ../../../l10n/ -1); do
-    make langpack-$locale LOCALE_MERGEDIR=.
+    rm $PWD/mergedir -rf
+    make merge-$locale LOCALE_MERGEDIR=$PWD/mergedir
+    make langpack-$locale LOCALE_MERGEDIR=$PWD/mergedir
 done
 
 
diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh
index bd91542..504a95f 100644
--- a/data/buildscripts/buildall.sh
+++ b/data/buildscripts/buildall.sh
@@ -26,18 +26,18 @@ EOF
 env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder execute $SRCDIR/run.sh
 }
 
-buildpackage windows belenos amd64 |tee  windows.log 2>&1
-buildpackage mac belenos amd64 |tee mac.log 2>&1
-buildpackage gnulinux toutatis i386 |tee gnulinux-i386.log 2>&1
-mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
-buildpackage gnulinux toutatis amd64 |tee gnulinux-amd64.log 2>&1
-mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
-buildpackage android belenos i386 |tee android.log 2>&1
+#buildpackage windows belenos amd64 |tee  windows.log 2>&1
+#buildpackage mac belenos amd64 |tee mac.log 2>&1
+#buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1
+#mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
+buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1
+#mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
+#buildpackage android belenos i386 |tee android.log 2>&1
 
 rm binaries -rf
 mkdir binaries/langpacks -p
-cp $1/obj-windows/dist/icecat*.zip binaries
-cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
+#cp $1/obj-windows/dist/icecat*.zip binaries
+#cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
 cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
-cp $1/obj-android/dist/icecat*.apk binaries
-cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
+#cp $1/obj-android/dist/icecat*.apk binaries
+#cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh
index f50cbc4..3583af8 100644
--- a/data/buildscripts/toolchain-android.sh
+++ b/data/buildscripts/toolchain-android.sh
@@ -22,6 +22,8 @@ while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update a
 echo export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools
 export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools
 
+ln -s $PWD/android-sdk-linux/build_tools $PWD/android-sdk-linux/build-tools
+
 pkill adb
 
 echo DONE