From 95d8edd62741b0ef504f0c47e374c8af90650458 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Sun, 25 Feb 2018 20:10:20 -0500
Subject: Version bumped to v52.3.0ESR, plus tuned up the buildscripts

---
 data/Changelog.IceCat                |  9 +++++++++
 data/buildscripts/buildall.sh        | 25 ++++++++++++++++---------
 data/buildscripts/mozconfig-gnulinux |  2 ++
 makeicecat                           |  2 +-
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/data/Changelog.IceCat b/data/Changelog.IceCat
index 28bd0d5..5d83888 100644
--- a/data/Changelog.IceCat
+++ b/data/Changelog.IceCat
@@ -1,3 +1,12 @@
+2018-02-25 Ruben Rodriguez <ruben@gnu.org>
+	* Updated to v52.6.0ESR
+	* Extensions:
+          - HTTPS Everywhere updated to 2018.1.11
+	  - "goteo.org payments with free JS" updated to 1.1
+	  - "LibreJS compatible Pay.gov" updated to 1.3
+	  - "Reveal hidden HTML" updated to 1.6
+          - Enabled WebRTC, but prevent leaking the LAN ip.
+
 2017-09-01 Ruben Rodriguez <ruben@gnu.org>
 	* Updated to v52.3.0ESR
 	* Added extension collection https://addons.mozilla.org/en-US/firefox/collections/NateN1222/librejs-compatibility-add-ons/
diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh
index 9485384..d3d48be 100644
--- a/data/buildscripts/buildall.sh
+++ b/data/buildscripts/buildall.sh
@@ -22,9 +22,15 @@ export CCACHE_DIR=$HOME/ccache/$1-$3
 mkdir $SRCDIR/../../toolchains || true
 cd $SRCDIR/../../toolchains
 sh ../data/buildscripts/toolchain-${1}.sh
-cd $SRCDIR/python/compare-locales
+
+apt-get install -y --force-yes mercurial
+cd /usr/local/src
+hg clone http://hg.mozilla.org/build/compare-locales/
+cd compare-locales/
+hg checkout FIREFOX_45_2_0esr_RELEASE
 python setup.py install
 cp /usr/local/bin/compare* /usr/bin
+
 cd $SRCDIR
 sh ../../data/buildscripts/build-${1}.sh
 EOF
@@ -32,18 +38,19 @@ 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 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
+sudo 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
+sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
+#buildpackage android belenos amd64  |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-android/dist/icecat*.apk binaries
 cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
+rename 's/linux/gnulinux/' binaries/*
diff --git a/data/buildscripts/mozconfig-gnulinux b/data/buildscripts/mozconfig-gnulinux
index c44e20f..29413d8 100644
--- a/data/buildscripts/mozconfig-gnulinux
+++ b/data/buildscripts/mozconfig-gnulinux
@@ -4,3 +4,5 @@ mk_add_options MOZ_OBJDIR=./obj-gnulinux
 ac_add_options --disable-webrtc
 
 ac_add_options --enable-gio
+
+ac_add_options --disable-gconf
diff --git a/makeicecat b/makeicecat
index a91e3a6..afcad6e 100644
--- a/makeicecat
+++ b/makeicecat
@@ -20,7 +20,7 @@
 set -e
 
 FFMAJOR=52
-FFMINOR=3
+FFMINOR=6
 FFSUB=0
 GNUVERSION=1
 FFVERSION=$FFMAJOR.$FFMINOR.${FFSUB}
-- 
cgit v1.2.3