Merge version 1:78.5.1-1~deb10u1+rpi1 and 1:78.5.1-1 to produce 1:78.5.1-1+rpi1

diff --cc debian/changelog
index f950ef1b0caf7070581af95b8d2892a7e6914ebc,0141c45a5538ccc516acac6c30722e50bf990ea9..845f06586a97c57765ad23705a485165baad7bb8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,3 +1,31 @@@
- thunderbird (1:78.5.1-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:78.5.1-1+rpi1) bullseye-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, 10 Dec 2020 01:13:44 +0000
- 
- thunderbird (1:78.5.1-1~deb10u1) stable-security; urgency=medium
- 
-   * Rebuild for buster-security
- 
-  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 03 Dec 2020 08:35:07 +0100
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Dec 2020 11:02:23 +0000
 +
  thunderbird (1:78.5.1-1) unstable; urgency=medium
  
    * [08556c2] New upstream version 78.5.1

diff --cc debian/rules
Simple merge