Merge version 1:68.5.0-1~deb10u1+rpi2 and 1:68.6.0-1~deb10u1 to produce 1:68.6.0...

diff --cc debian/changelog
index e442737c2dc6cdf011ca6f43612eb5b4e305975b,cfe6c65c4f11dd2083b85559ccab8e78b955b2c7..17a222d481399356906fca4c76869869b3aafbd1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,27 +1,47 @@@
- thunderbird (1:68.5.0-1~deb10u1+rpi2) buster-staging; urgency=medium
- 
-   * Actually build the binary packages on armhf.
-   * Yet more clean target fixing.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 15 Mar 2020 16:27:21 +0000
- 
- thunderbird (1:68.5.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:68.6.0-1~deb10u1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought over from firefox-esr 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 introduced in 60.4.0-1+rpi1 by Peter Michael Green]
 +  * Further fixes to clean target (still not completely fixed :( ).
 +
 +  [changes introduced in 1:68.5.0-1~deb10u1+rpi1 by Peter Michael Green]
 +  * Disable neon (patches taken from firefox-esr package)
 +  * Build in a chroot with arm64 binutils-arm-linux-gnueabihf
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Feb 2020 15:56:01 +0000
++  [changes brought forward from 1:68.5.0-1~deb10u1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 15 Mar 2020 16:27:21 +0000]
++  * Actually build the binary packages on armhf.
++  * Yet more clean target fixing.
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Mar 2020 21:10:40 +0000
++
+ thunderbird (1:68.6.0-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 17 Mar 2020 16:24:05 +0100
+ 
+ thunderbird (1:68.6.0-1) unstable; urgency=medium
+ 
+   * [5709774] New upstream version 68.6.0
+     Fixed CVE issues in upstream version 68.6.0 (MFSA 2020-10):
+     CVE-2019-20503: Out of bounds reads in sctp_load_addresses_from_init
+     CVE-2020-6805: Use-after-free when removing data about origins
+     CVE-2020-6806: BodyStream::OnInputStreamReady was missing protections
+                    against state confusion
+     CVE-2020-6807: Use-after-free in cubeb during stream destruction
+     CVE-2020-6811: Devtools' 'Copy as cURL' feature did not fully escape
+                    website-controlled data, potentially leading to
+                    command injection
+     CVE-2020-6812: The names of AirPods with personally identifiable
+                    information were exposed to websites with camera or
+                    microphone permission
+     CVE-2020-6814: Memory safety bugs fixed in Thunderbird 68.6
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Mon, 16 Mar 2020 20:01:29 +0100
  
  thunderbird (1:68.5.0-1~deb10u1) stable-security; urgency=medium