Merge version 1:91.5.1-1+rpi1 and 1:91.5.0-2~deb10u1 to produce 1:91.5.0-2~deb10u1...

diff --cc debian/changelog
index ac312e1053edf8f03a29a17fd16ca35d9510684a,b5d39935834c235e6ef0de3af2356127cbe8e85a..e9ee32165d6355775630fecda12cbcd276b7b0a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,16 +1,56 @@@
- thunderbird (1:91.5.1-1+rpi1) bookworm-staging; urgency=medium
++thunderbird (1:91.5.0-2~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
 +
 +  [changes brought forward from 1:78.5.1-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 00:33:33 +0000]
 +  * Actually build thunderbird binary on armhf
 +    (changelog says this was already done, but it got lost somewhere
 +    along the way).
 +
 +  [changes introduced in 1:91.3.2-1+rpi1 by Peter Michael Green]
 +  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
 +    definitions error.
 +
 +  [changes introduced in 1:91.5.1-1+rpi1 by Peter Micheal Green]
 +  * Further hacks to rust target selection.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 05 Feb 2022 14:30:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 16 Feb 2022 01:42:50 +0000
 +
- thunderbird (1:91.5.1-1) unstable; urgency=medium
+ thunderbird (1:91.5.0-2~deb10u1) buster-security; urgency=medium
  
-   * [130bab2] New upstream version 91.5.1
+   * Rebuild for buster-security
+   * [5204a6c] d/thunderbird.NEWS: Adjust version to buster
  
-  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 23 Jan 2022 18:41:12 +0100
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 13 Jan 2022 16:10:00 +0100
+ 
+ thunderbird (1:91.5.0-2~deb11u1) bullseye-security; urgency=medium
+ 
+   * Rebuild for bullseye-security
+   * [3fb049d] d/thunderbird.NEWS: Information about solved issue
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 13 Jan 2022 16:10:00 +0100
  
  thunderbird (1:91.5.0-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge