Merge version 1:102.1.1-1+rpi1 and 1:102.2.1-1 to produce 1:102.2.1-1+rpi1

diff --cc debian/changelog
index 5d11473e83032d3c31ac93af635b875aa43d6592,72d8e0b18a64bff444dba44974e5969ffdc06806..e9989693a69d7bef37535f8b9d1cbb7fc540c8ae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,48 +1,92 @@@
- thunderbird (1:102.1.1-1+rpi1) bookworm-staging; urgency=medium
++thunderbird (1:102.2.1-1+rpi1) bookworm-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.
 +
 +  [changes introduced in 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Don't build rust code with Clto to avoid out of memory errors.
 +  * Disable more armv7/neon stuff.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Aug 2022 12:17:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Sep 2022 08:20:09 +0000
++
+ thunderbird (1:102.2.1-1) unstable; urgency=medium
+ 
+   * [e1d0f74] New upstream version 102.2.1
+     Fixed CVE issues in upstream version 102. (MFSA 2022-38):
+     CVE-2022-3033: Leaking of sensitive information when composing a response
+                    to an HTML email with a META refresh tag
+     CVE-2022-3032: Remote content specified in an HTML document that was
+                    nested inside an iframe's srcdoc attribute was not blocked
+     CVE-2022-3034: An iframe element in an HTML email could trigger a
+                    network request
+     CVE-2022-36059: Matrix SDK bundled with Thunderbird vulnerable to
+                     denial-of-service attack
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 01 Sep 2022 07:52:16 +0200
+ 
+ thunderbird (1:102.2.0-1) unstable; urgency=medium
+ 
+   [ Amr Ibrahim ]
+   * [02a3990] thunderbird.desktop: Update StartupWMClass
+     (Closes: #1017420, #1014748)
+ 
+   [ Carsten Schoenert ]
+   * [f7b62a8] d-create-upstream-tarballs.py: Use correct variable
+   * [7194457] New upstream version 102.2.0
+     Fixed CVE issues in upstream version 102. (MFSA 2022-36):
+     CVE-2022-38472: Address bar spoofing via XSLT error handling
+     CVE-2022-38473: Cross-origin XSLT Documents would have inherited the
+                     parent's permissions
+     CVE-2022-38476: Data race and potential use-after-free in PK11_ChangePW
+     CVE-2022-38477: Memory safety bugs fixed in Thunderbird 102.2
+     CVE-2022-38478: Memory safety bugs fixed in Thunderbird 102.2, and
+                     Thunderbird 91.13
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 28 Aug 2022 17:23:50 +0200
+ 
+ thunderbird (1:102.1.2-1) unstable; urgency=medium
+ 
+   * [78f2899] d/copyright: Update content due upstream changes
+   * [55dba1d] d/source.filter: Update content to filter out
+   * [3e19497] Lintian: Adjust overrides for thunderbird package
+   * [567e0c4] Lintian: Adjust overrides for source package
+   * [c201484] New upstream version 102.1.2
+     (Closes: #1016944)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 11 Aug 2022 16:37:07 +0200
  
  thunderbird (1:102.1.1-1) unstable; urgency=medium