From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 13 Jan 2020 15:55:53 +0000 (+0000)
Subject: Merge version 68.4.1esr-1~deb10u1+rpi1 and 68.4.1esr-1 to produce 68.4.1esr-1+rpi1
X-Git-Tag: archive/raspbian/68.4.1esr-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85039506a3d05f9dd262fe6f9abb552c8f9db928;p=firefox-esr.git

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

85039506a3d05f9dd262fe6f9abb552c8f9db928
diff --cc debian/changelog
index 5669c524023,e7b5e2650e5..d3ed789b2a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,4 +1,20 @@@
- firefox-esr (68.4.1esr-1~deb10u1+rpi1) buster-staging; urgency=medium
++firefox-esr (68.4.1esr-1+rpi1) bullseye-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>  Fri, 10 Jan 2020 21:47:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Jan 2020 15:55:49 +0000
 +
- firefox-esr (68.4.1esr-1~deb10u1) buster-security; urgency=medium
+ firefox-esr (68.4.1esr-1) unstable; urgency=medium
  
    * New upstream release.
    * Fix for mfsa2020-03, also known as CVE-2019-17026.