Merge version 1:78.5.1-1+rpi2 and 1:78.6.1-1 to produce 1:78.6.1-1+rpi1

diff --cc debian/changelog
index 0e48b57426b1ac059370b489eb0ba39bd502ec9b,fdafa560d4dd35bd5f3b2bbea6a14fc6222d09ff..72241382c115f7fa908267f89e177f4a5d43942b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,48 +1,81 @@@
- thunderbird (1:78.5.1-1+rpi2) bullseye-staging; urgency=medium
- 
-   * Actually build thunderbird binary on armhf
-     (changelog says this was already done, but it got lost somewhere
-     along the way).
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Dec 2020 00:33:33 +0000
- 
- thunderbird (1:78.5.1-1+rpi1) bullseye-staging; urgency=medium
++thunderbird (1:78.6.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>  Sun, 13 Dec 2020 11:02:23 +0000
++  [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).
++
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 26 Jan 2021 17:28:13 +0000
++
+ thunderbird (1:78.6.1-1) unstable; urgency=medium
+ 
+   [ Carsten Schoenert ]
+   * [67f6117] Add Apache2 notice for third_party/python/coverage
+   * [38b9ff7] lintian: adding override for false positive in SVG file
+ 
+   [ Carles Pina i Estany ]
+   * [529d53a] d/thunderbird-wrapper.sh: Unset DEBUG/DEBUGGER variables
+     (Closes: #960230)
+   * [6d48708] d/thunderbird-wrapper-helper.sh: Adjust help text
+ 
+   [ Carsten Schoenert ]
+   * [5309e91] d/thunderbird-wrapper*.sh: Prefixing some local variables
+   * [07b4733] New upstream version 78.6.1
+     Fixed CVE issues in upstream version 78.6.1 (MFSA 2021-02):
+     CVE-2020-16044: Use-after-free write when handling a malicious
+                     COOKIE-ECHO SCTP chunk
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 16 Jan 2021 14:59:02 +0100
+ 
+ thunderbird (1:78.6.0-1) unstable; urgency=medium
+ 
+   * [1410f1e] d/watch: update to version 4
+   * [a8303b7] d/rules: use python3 explicitly while calling mach
+   * [f3f535e] New upstream version 78.6.0
+     Fixed CVE issues in upstream version 78.6 (MFSA 2020-56):
+     CVE-2020-16042: Operations on a BigInt could have caused uninitialized
+                     memory to be exposed
+     CVE-2020-26971: Heap buffer overflow in WebGL
+     CVE-2020-26973: CSS Sanitizer performed incorrect sanitization
+     CVE-2020-26974: Incorrect cast of StyleGenericFlexBasis resulted in a heap
+                     use-after-free
+     CVE-2020-26978: Internal network hosts could have been probed by a
+                     malicious webpage
+     CVE-2020-35111: The proxy.onRequest API did not catch view-source URLs
+     CVE-2020-35112: Opening an extension-less download may have inadvertently
+                     launched an executable instead
+     CVE-2020-35113: Memory safety bugs fixed in Thunderbird 78.6
+     (Closes: #972072, #973697)
+   * [16a7ab7] /u/l/thunderbird: Correct escape sequencing for gdb calling
+     We need to do a better escaping of values of the '-ex' option otherwise
+     the shell is refusing the concatenated string we want to use as call.
+     (Closes: #976979)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 15 Dec 2020 10:12:34 +0100
  
  thunderbird (1:78.5.1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge