Merge version 1:78.11.0-1~deb10u1+rpi1 and 1:78.12.0-1~deb10u1 to produce 1:78.12...

diff --cc debian/changelog
index 94aac452123361fa5b0917cec6ee18087794deae,f5337d6de256d35b3219404e5f20361cddba4f84..522910467ef3788d021b36faf474d3b4a070e256
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,37 +1,65 @@@
- thunderbird (1:78.11.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:78.12.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, 10 Jun 2021 12:57:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Aug 2021 17:12:49 +0000
++
+ thunderbird (1:78.12.0-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 17 Jul 2021 10:57:00 +0200
+ 
+ thunderbird (1:78.12.0-1) unstable; urgency=medium
+ 
+   * [74d3cdb] New upstream version 78.12.0
+     Fixed CVE issues in upstream version 78.12 (MFSA 2021-30):
+     CVE-2021-29969: IMAP server responses sent by a MITM prior to STARTTLS
+                     could be processed
+     CVE-2021-29970: Use-after-free in accessibility features of a document
+     CVE-2021-30547: Out of bounds write in ANGLE
+     CVE-2021-29976: Memory safety bugs fixed in Thunderbird 78.12
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 17 Jul 2021 09:33:28 +0200
+ 
+ thunderbird (1:78.11.0-2) unstable; urgency=medium
+ 
+   [ Carsten Schoenert ]
+   * [241e539] d/thunderbird.1: Correct debugger option
+     Remove parts that are no longer valid, especially there is no dedicated
+     shell script any more the user has to start, calling 'thunderbird -g' is
+     enough to start a GDB call.
+   * [66deb37] thunderbird: Use internal NSS source while package built
+     (Closes: #989839, #989843, #989979, #989983, #989922, #990012)
+   * [07fb6ef] d/thunderbird-wrapper.sh: Use '${}' syntax for variables
+ 
+   [ Kevin Locke ]
+   * [d003e26] d/thunderbird-wrapper.sh: Make gdb call more fail safe
+     (Closes: #942799)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 20 Jun 2021 07:20:41 +0200
  
  thunderbird (1:78.11.0-1~deb10u1) stable-security; urgency=medium