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

diff --cc debian/changelog
index cc0ab885606914640428504d1c01825af66f05d4,13f197539124716df9d9c102ef522f3cf291ecc5..dfc0c2ab3726a8cf5f038a00684cbca432d71513
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,20 +1,36 @@@
- firefox-esr (68.2.0esr-1+rpi1) bullseye-staging; urgency=medium
++firefox-esr (68.3.0esr-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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 05 Nov 2019 19:37:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Dec 2019 10:56:44 +0000
 +
- firefox-esr (68.2.0esr-1) unstable; urgency=medium
+ firefox-esr (68.3.0esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2019-37, also known as:
+     CVE-2019-17008, CVE-2019-11745, CVE-2019-17010, CVE-2019-17005,
+     CVE-2019-17011, CVE-2019-17012.
+ 
+   * debian/control*: Bump nss build dependencies.
+   * debian/rules, debian/control.in:
+     - Build with nodejs-mozilla on jessie and stretch.
+     - Build with nasm-mozilla on jessie and stretch.
+     - Don't build with system libvpx on stretch.
+     (Thanks Emilio Pozuelo Monfort)
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 04 Dec 2019 08:56:07 +0900
+ 
+ firefox-esr (68.2.0esr-1~deb10u1) buster-security; urgency=medium
  
    * New upstream release.
    * Fixes for mfsa2019-33, also known as:

diff --cc debian/patches/series
index 9cc213913bd76c16e845ce58f9c57a628ae33a0c,03a7a0638da1a70f8f4ca616cf3d7d7732c9ba3f..bccbbb002e261cc802ddd3630b693a2686deb4d7
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -25,8 -25,4 +25,7 @@@ debian-hacks/Build-against-system-libjs
  debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch
  debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch
  debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
- debian-hacks/Attempt-to-work-around-make-issue-happening-on-arch-.patch
  debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch

diff --cc debian/rules
Simple merge

diff --cc old-configure
Simple merge