From 833ae0e11bc62a23d80988a361147153494b3091 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 18 Oct 2019 23:38:44 -0400
Subject: Start work on IceCat 68

* makeicecat: bump FFMAJOR and FFMINOR, allow pre-existing output
directory, and use long key id for the Mozilla Software Releases key.
---
 makeicecat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/makeicecat b/makeicecat
index 5a4390b..402e093 100644
--- a/makeicecat
+++ b/makeicecat
@@ -19,8 +19,8 @@
 
 set -euxo pipefail
 
-FFMAJOR=60
-FFMINOR=7
+FFMAJOR=68
+FFMINOR=1
 FFSUB=0
 GNUVERSION=1
 FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB
@@ -29,7 +29,7 @@ SOURCEDIR=icecat-$FFVERSION
 
 DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data
 
-mkdir output
+mkdir -p output
 cd output
 
 ###############################################################################
@@ -40,9 +40,9 @@ rm mozilla-esr${FFMAJOR} $SOURCEDIR -rf
 
 wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz
 wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
-gpg --recv-keys --keyserver keyserver.ubuntu.com 24C6F355
+gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
 gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-echo -n 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 
 echo Extracting Firefox tarball
 tar -xf firefox-${FFVERSION}esr.source.tar.xz
-- 
cgit v1.2.3