Merge version 1:78.4.2-1~deb10u1+rpi1 and 1:78.5.0-1~deb10u1 to produce 1:78.5.0...

diff --cc debian/changelog
index bf513c3e9d08e50082e864bcfcc44d5456b5c730,1c180a3efff1ac8bbed13d281badf52306a343de..43c8d004970c44d226eac11c3e9ae89785b8138e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,35 +1,63 @@@
- thunderbird (1:78.4.2-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:78.5.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
 +
 +  [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.
 +
 +  [changes brought over from firefox-esr 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes introduced in 1:78.4.0-1~deb10u1+rpi1 by Peter Michael Green]
 +  * Add export NSS_DISABLE_ARM32_NEON=1 to hopefully disable neon in nss.
 +  * Adding the define in debian/rules didn't seem to work, try to patch out neon in nss instead
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 02:49:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Nov 2020 01:13:13 +0000
++
+ thunderbird (1:78.5.0-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 20 Nov 2020 17:38:25 +0100
+ 
+ thunderbird (1:78.5.0-1) unstable; urgency=medium
+ 
+   * [7842f02] New upstream version 78.5.0
+     Fixed CVE issues in upstream version 78.5 (MFSA 2020-51):
+     CVE-2020-26951: Parsing mismatches could confuse and bypass security
+                     sanitizer for chrome privileged code
+     CVE-2020-16012: Variable time processing of cross-origin images during
+                     drawImage calls
+     CVE-2020-26953: Fullscreen could be enabled without displaying the
+                     security UI
+     CVE-2020-26956: XSS through paste (manual and clipboard API)
+     CVE-2020-26958: Requests intercepted through ServiceWorkers lacked MIME
+                     type restrictions
+     CVE-2020-26959: Use-after-free in WebRequestService
+     CVE-2020-26960: Potential use-after-free in uses of nsTArray
+     CVE-2020-15999: Heap buffer overflow in freetype
+     CVE-2020-26961: DoH did not filter IPv4 mapped IP Addresses
+     CVE-2020-26965: Software keyboards may have remembered typed passwords
+     CVE-2020-26966: Single-word search queries were also broadcast to local
+                     network
+     CVE-2020-26968: Memory safety bugs fixed in Thunderbird 78.5
+   * [e19743e] rebuild patch queue from patch-queue branch
+     removed patch (included upstream):
+     fixes/Bug-1663715-Update-syn-and-proc-macro2-so-that-Firefox-ca.patch
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 18 Nov 2020 20:06:09 +0100
  
  thunderbird (1:78.4.2-1~deb10u1) stable-security; urgency=medium
  

diff --cc debian/patches/series
index c241dfb1f832dd63a3a2d562fb98e7062b2378fc,0e62f1b1e5db5536ebac8c6730e95781adff2d51..2c8110f08a0214672b93d35a82ccdf7979246a9b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -40,9 -40,3 +40,8 @@@ fixes/reduce-the-rust-debuginfo-level-o
  porting-s390x/Explicitly-instantiate-TIntermTraverser-traverse-TIntermN.patch
  fixes/Bug-1650299-Unify-the-inclusion-of-the-ICU-data-file.-r-f.patch
  fixes/Don-t-build-ICU-in-parallel.patch
- fixes/Bug-1663715-Update-syn-and-proc-macro2-so-that-Firefox-ca.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +patch-out-neon-in-freebl.patch