From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 9 Apr 2020 07:53:07 +0000 (+0100)
Subject: Merge version 68.6.1esr-1~deb10u1+rpi1 and 68.7.0esr-1~deb10u1 to produce 68.7.0esr... 
X-Git-Tag: archive/raspbian/68.7.0esr-1_deb10u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45fe0faad0d50516726d61cd1b6a83b968f9a796;p=firefox-esr.git

Merge version 68.6.1esr-1~deb10u1+rpi1 and 68.7.0esr-1~deb10u1 to produce 68.7.0esr-1~deb10u1+rpi1
---

45fe0faad0d50516726d61cd1b6a83b968f9a796
diff --cc debian/changelog
index 4a2c3866201,3c64ad0e341..282669479b8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,26 @@@
- firefox-esr (68.6.1esr-1~deb10u1+rpi1) buster-staging; urgency=medium
++firefox-esr (68.7.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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Apr 2020 21:34:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Apr 2020 07:53:03 +0000
++
+ firefox-esr (68.7.0esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * New upstream release
+   * Fixes for mfsa2020-13, also known as:
+     CVE-2020-6821, CVE-2020-6822, CVE-2020-6825.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 08 Apr 2020 07:54:16 +0900
  
  firefox-esr (68.6.1esr-1~deb10u1) buster-security; urgency=medium