Merge version 1:102.9.0-1~deb11u1+rpi1 and 1:102.10.0-1~deb11u1 to produce 1:102...

diff --cc debian/changelog
index 03f4905cbc1852db09a84941b595d290cab8bf2f,dfd93bbdfcdd22fa95706c6a4dde0b6280173afc..7ad137a5f504c9c08348af57a9319f856fc62179
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,46 +1,95 @@@
- thunderbird (1:102.9.0-1~deb11u1+rpi1) bullseye-staging; urgency=medium
++thunderbird (1:102.10.0-1~deb11u1+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
 +
 +  [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.
 +
 +  [changes brought over from firefox-esr 102.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable jit (or at least try to)
 +    + Pass disable-jit from debian/rules
 +    + Nerf jit detection in s/moz.configure
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 30 Mar 2023 12:39:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 13 May 2023 17:59:13 +0000
++
+ thunderbird (1:102.10.0-1~deb11u1) bullseye-security; urgency=medium
+ 
+   * Rebuild for bullseye-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 19 Apr 2023 17:28:54 +0200
+ 
+ thunderbird (1:102.10.0-1) unstable; urgency=medium
+ 
+   * [8afefce] New upstream version 102.10.0
+     Fixed CVE issues in upstream version 102.10 (MFSA 2023-15):
+     CVE-2023-29532: Mozilla Maintenance Service Write-lock bypass
+     CVE-2023-29533: Fullscreen notification obscured
+     CVE-2023-1999: Double-free in libwebp
+     CVE-2023-29535: Potential Memory Corruption following Garbage Collector
+                     compaction
+     CVE-2023-29536: Invalid free from JavaScript code
+     CVE-2023-0547: Revocation status of S/Mime recipient certificates was
+                    not checked
+     CVE-2023-29479: Hang when processing certain OpenPGP messages
+     CVE-2023-29539: Content-Disposition filename truncation leads to
+                     Reflected File Download
+     CVE-2023-29541: Files with malicious extensions could have been
+                     downloaded unsafely on Linux
+     CVE-2023-29542: Bypass of file download extension restrictions
+     CVE-2023-1945: Memory Corruption in Safe Browsing Code
+     CVE-2023-29548: Incorrect optimization result on ARM64
+     CVE-2023-29550: Memory safety bugs fixed in Thunderbird 102.10
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Mon, 17 Apr 2023 21:32:45 +0200
+ 
+ thunderbird (1:102.9.1-1) unstable; urgency=medium
+ 
+   [ Timothy Pearson ]
+   * [de7c4f8] Explicitly set SQLite endianness on ppc64el
+     (Closes: #1033534)
+ 
+   [ Carsten Schoenert ]
+   * [06059fb] New upstream version 102.9.1
+     Fixed CVE issues in upstream version 102.9.1 (MFSA 2023-12):
+     CVE-2023-28427: Matrix SDK bundled with Thunderbird vulnerable to
+                     denial-of-service attack
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 29 Mar 2023 17:34:39 +0200
  
  thunderbird (1:102.9.0-1~deb11u1) bullseye-security; urgency=medium
  

diff --cc debian/rules
Simple merge