Updated to v31.4.0ESR

 * Search form in about:icecat now searches in default search engine
 * Disabled accessibility.blockautorefresh
 * Replaced references to Open Source with Free Software where applicable
 * Added html5-video-everywhere v0.1.1 extension: https://github.com/lejenome/html5-video-everywhere
 * Updated LibreJS to 6.0.8

Build scripts updated to use pbuilder

3 files changed, 71 insertions, 22 deletions

diff --git a/tools/buildbinaries b/tools/buildbinaries
index 0301cd7..2a5236c 100644
--- a/tools/buildbinaries
+++ b/tools/buildbinaries
@@ -1,46 +1,59 @@
 #!/bin/bash
 
 set -e
+set -x
 
-VERSION=31.2.0
-JAILDIR="/home/systems/gnuzilla/jails/toutatis"
-ARCHS="i386 amd64"
+if [ $# != 1 ]; then
+  echo E: pass the source dir as parameter
+  exit 1
+fi
 
-rm binaries -rf
 mkdir binaries
 
-for ARCH in $ARCHS; do
-  [ -f $JAILDIR-$ARCH/proc/cpuinfo ] || mount -t proc none $JAILDIR-$ARCH/proc
-  mount -t tmpfs -o size=20G none $JAILDIR-$ARCH/root/
-  cp icecat-$VERSION -a $JAILDIR-$ARCH/root/
+for ARCH in i386 amd64; do
+
+cp -a $1 binaries/$ARCH
+mkdir binaries/$ARCH/temp
 
-  cat << EOF > $JAILDIR-$ARCH/root/buildscript
+cat << EOF > binaries/$ARCH/run.sh
 set -e
 set -x
 
-export LANG=C
-cd /root/icecat-$VERSION
-mkdir temp
-cd temp
+if [ $ARCH = "i386" ]; then
+for BIN in /bin/uname /usr/bin/arch ; do
+cp \$BIN \$BIN.orig
+cat << EOF2 > \$BIN
+#!/bin/bash
+\$BIN.orig "\\\$@" | sed s/x86_64/i686/g
+EOF2
+chmod 755 \$BIN
+done
+fi
 
+cd $PWD/binaries/$ARCH/temp
+apt-get -q -y --yes build-dep firefox
 ../configure --with-l10n-base=\$PWD/../l10n --enable-official-branding --disable-crashreporter --disable-gnomevfs --enable-gio --disable-debug --enable-gstreamer=0.10 --with-distribution-id=org.gnu --disable-updater
-make -j8
+make -j7
 
 cd browser/installer
 make
 
+[ $ARCH = "i386" ] && exit 0
 cd ../locales
 for locale in \$(ls ../../../l10n/ -1); do
 make langpack-\$locale LOCALE_MERGEDIR=.
 done
 EOF
 
-  chroot $JAILDIR-$ARCH /bin/bash /root/buildscript
-  cp $JAILDIR-$ARCH/root/icecat-$VERSION/temp/dist/icecat*.tar.bz2 binaries
-  [ $ARCH = i386 ] && cp $JAILDIR-$ARCH/root/icecat-$VERSION/temp/dist/linux-*/xpi/ -a binaries/langpacks
-
-  umount $JAILDIR-$ARCH/root/ || true
-  umount $JAILDIR-$ARCH/proc || true
 
+env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=toutatis ARCH=$ARCH pbuilder execute $PWD/binaries/$ARCH/run.sh
 done
 
+mv binaries build
+mkdir -p binaries/langpacks
+cp build/i386/temp/dist/icecat-* binaries
+cp build/amd64/temp/dist/icecat-* binaries
+cp build/amd64/temp/dist/linux-x86_64/xpi/icecat-* binaries/langpacks
+cp icecat-*.tar.bz2 binaries
+rm binaries/*.json binaries/*.txt
+
diff --git a/tools/createdebsrcrepo b/tools/createdebsrcrepo
new file mode 100644
index 0000000..9f2ce24
--- /dev/null
+++ b/tools/createdebsrcrepo
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+rm -rf repo
+mkdir repo
+cd icecat-*
+debian/rules debian/control
+dpkg-buildpackage -Zbzip2 -kD7E04784 -S -tc
+
+cd ..
+
+cp icecat_* repo
+
+cat << EOF  > release.conf
+APT::FTPArchive::Release::Origin "GNU";
+APT::FTPArchive::Release::Label "temporary icecat source repo";
+APT::FTPArchive::Release::Suite "stable";
+APT::FTPArchive::Release::Codename "debian";
+APT::FTPArchive::Release::Architectures "noarch";
+APT::FTPArchive::Release::Components "main";
+APT::FTPArchive::Release::Description "temporary icecat source repo";
+EOF
+
+cd repo
+
+dpkg-scansources . /dev/null > Sources
+apt-ftparchive -c=../release.conf release . > Release
+sed -i '/Release/d' Release
+gpg --default-key D7E04784 -abs -o Release.gpg Release 
+
diff --git a/tools/gnupload b/tools/gnupload
index 07cc1d9..520c0ec 100644
--- a/tools/gnupload
+++ b/tools/gnupload
@@ -7,7 +7,12 @@ find binaries -type f | grep -e asc$ -e sig$ | xargs -r rm
 
 set -e
 
-VERSION=31.2.0
+if [ $# != 1 ]; then
+  echo E: pass the version as parameter
+  exit 1
+fi
+VERSION=$1
+
 newline="
 "
 mputs=""
@@ -44,7 +49,7 @@ mputs="${mputs}put binaries/langpacks/$file.directive.asc $file.directive.asc $n
 done
 
 #cat << EOF
-ftp -v -p -n -i  << EOF | tee log
+ftp -v -p -n -i  << EOF 2>&1| tee log
 open ftp-upload.gnu.org
 user anonymous anonymous
 cd /incoming/ftp