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

diff --cc debian/changelog
index a7263da266f6b4eedb39d188c2db36b8234a4d30,032ea17bc2cd3dd0437c2ba6626fed8201adc5f7..fcc52cadb83d0e564490a6d63feaa2d1bb77b461
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,3 +1,23 @@@
- thunderbird (1:68.7.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:68.7.0-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Apr 2020 14:16:59 +0000
- 
- thunderbird (1:68.7.0-1~deb10u1) stable-security; urgency=medium
- 
-   * Rebuild for buster-security
- 
-  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 12 Apr 2020 10:21:40 +0200
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Apr 2020 04:14:45 +0000
 +
  thunderbird (1:68.7.0-1) unstable; urgency=medium
  
    * [c0052af] New upstream version 68.7.0

diff --cc debian/control
Simple merge