Merge version 1:78.8.0-1~deb10u1+rpi1 and 1:78.9.0-1~deb10u1 to produce 1:78.9.0...

diff --cc debian/changelog
index 3ca6cd57b7eff52cdc7b350a1f023efe6a437371,6d4a306ce792b4449143becc325c6f76a02dafc0..b4fed9cbe90f4d8ccbcbffa148eaa0e950db3c50
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,30 +1,58 @@@
- thunderbird (1:78.8.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:78.9.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>  Mon, 01 Mar 2021 07:39:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Mar 2021 14:27:25 +0000
++
+ thunderbird (1:78.9.0-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 24 Mar 2021 19:57:04 +0100
+ 
+ thunderbird (1:78.9.0-1) unstable; urgency=medium
+ 
+   [ Colomban Wendling ]
+   * [7d454de] d/thunderbird.desktop: Switch StartupWMClass
+     (Closes: #985366)
+ 
+   [ Carsten Schoenert ]
+   * [23fe9ce] d/source.filter: small update to filtering list
+   * [828b9d7] New upstream version 78.9.0
+     Fixed CVE issues in upstream version 78.9 (MFSA 2021-12):
+     CVE-2021-23981: Texture upload into an unbound backing buffer resulted in
+                     an out-of-bound read
+     CVE-2021-23982: Internal network hosts could have been probed by a
+                     malicious webpage
+     CVE-2021-23984: Malicious extensions could have spoofed popup information
+     CVE-2021-23987: Memory safety bugs fixed in Thunderbird 78.9
+   * [cf4fbde] rebuild patch queue from patch-queue branch
+     Removed patch (included upstream):
+     porting-s390x/Explicitly-instantiate-TIntermTraverser-traverse-TIntermN.patch
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 23 Mar 2021 15:55:43 +0100
  
  thunderbird (1:78.8.0-1~deb10u1) stable-security; urgency=medium
  

diff --cc debian/patches/series
index 9927d7b6afc730193a869456a17331511ff94aa8,891a24e4f2238392209a0d63a198184bd1452186..86fc8d37928a6e169a700589f6af708720f3d761
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -35,11 -35,5 +35,10 @@@ debian-hacks/Make-Thunderbird-build-rep
  porting-s390x/Use-more-recent-embedded-version-of-sqlite3.patch
  fixes/Add-missing-bindings-for-mips-in-the-authenticator-crate.patch
  fixes/reduce-the-rust-debuginfo-level-on-selected-architectures.patch
- 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
 +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