Merge version 1:78.10.0-1~deb10u1+rpi1 and 1:78.11.0-1~deb10u1 to produce 1:78.11...

diff --cc debian/changelog
index 1df4df296e896b399760d0bc1c89ea1bdb26b3d2,1ab32ae78ebaab24186851d8d4ba3a4ff0e7271b..94aac452123361fa5b0917cec6ee18087794deae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,26 +1,54 @@@
- thunderbird (1:78.10.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:78.11.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>  Thu, 22 Apr 2021 22:18:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 12:57:00 +0000
++
+ thunderbird (1:78.11.0-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 04 Jun 2021 18:16:00 +0200
+ 
+ thunderbird (1:78.11.0-1) unstable; urgency=medium
+ 
+   * [42c4a87] New upstream version 78.11.0
+     Fixed CVE issues in upstream version 78.11 (MFSA 2021-26):
+     CVE-2021-29967: Memory safety bugs fixed in Thunderbird 78.11
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 03 Jun 2021 17:22:34 +0200
+ 
+ thunderbird (1:78.10.2-1) unstable; urgency=medium
+ 
+   * [69552d8] New upstream version 78.10.2
+     Fixed CVE issues in upstream version 78.10.2 (MFSA 2021-22):
+     CVE-2021-29957: Partial protection of inline OpenPGP message not indicated
+     CVE-2021-29956: Thunderbird stored OpenPGP secret keys without master
+                     password protection
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 19 May 2021 21:57:11 +0200
  
  thunderbird (1:78.10.0-1~deb10u1) stable-security; urgency=medium