Merge version 68.3.0esr-1~deb10u1+rpi1 and 68.4.1esr-1~deb10u1 to produce 68.4.1esr...

diff --cc debian/changelog
index dfc0c2ab3726a8cf5f038a00684cbca432d71513,a6221619387f1ec04878e4c85a166719954587a2..5669c52402369fc937fd495cf394373e64719a43
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,26 +1,42 @@@
- firefox-esr (68.3.0esr-1~deb10u1+rpi1) buster-staging; urgency=medium
++firefox-esr (68.4.1esr-1~deb10u1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Dec 2019 10:56:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Jan 2020 21:47:36 +0000
++
+ firefox-esr (68.4.1esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * New upstream release.
+   * Fix for mfsa2020-03, also known as CVE-2019-17026.
+ 
+  -- Mike Hommey <glandium@debian.org>  Thu, 09 Jan 2020 06:40:28 +0900
+ 
+ firefox-esr (68.4.0esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2020-02, also known as:
+     CVE-2019-17016, CVE-2019-17017, CVE-2019-17022, CVE-2019-17024.
+ 
+   * debian/rules: Don't build with --compress-debug-sections on jessie.
+   * debian/rules: Use sourcestamp.txt for MOZ_BUILD_DATE. Closes: #946193.
+ 
+   * sourcestamp.txt: Fill with the missing info.
+   * intl/icu_sources_data.py: Don't build ICU in parallel.
+   * gfx/skia/skia/third_party/skcms/src/Transform_inl.h: Work around older
+     GCC ICEs on arm.
+     (Thanks Emilio Pozuelo Monfort)
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 08 Jan 2020 08:54:04 +0900
  
  firefox-esr (68.3.0esr-1~deb10u1) buster-security; urgency=medium
  

diff --cc debian/patches/series
index bccbbb002e261cc802ddd3630b693a2686deb4d7,04070ae9c592b0e833241801bc05c3b25cdf3f0d..ee0a156b7acde10e11c670cf74a0760a0551b661
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -26,6 -29,4 +29,7 @@@ debian-hacks/Use-the-Mozilla-Location-S
  debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch
  debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
  debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch
+ debian-hacks/Don-t-build-ICU-in-parallel.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch

diff --cc debian/rules
Simple merge