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

diff --cc debian/changelog
index 7ad137a5f504c9c08348af57a9319f856fc62179,c863d6ff6ecf444ea3383f68ae1566a33e2c4170..b2ba199c7e4d87fbbf9bda7f4c519cb5677c1618
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,27 +1,76 @@@
- thunderbird (1:102.10.0-1~deb11u1+rpi1) bullseye-staging; urgency=medium
++thunderbird (1:102.11.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>  Sat, 13 May 2023 17:59:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 20 May 2023 14:54:28 +0000
++
+ thunderbird (1:102.11.0-1~deb11u1) bullseye-security; urgency=medium
+ 
+   * Rebuild for bullseye-security
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 12 May 2023 18:30:14 +0200
+ 
+ thunderbird (1:102.11.0-1) unstable; urgency=medium
+ 
+   [ intrigeri ]
+   * [f3e5479] AppArmor: update profile from upstream at
+     commit a03a894c6c30b7a566aa74645802de1cea580bca
+ 
+   [ Carsten Schoenert ]
+   * [0626d72] New upstream version 102.11.0
+     Fixed CVE issues in upstream version 102.11 (MFSA 2023-18):
+     CVE-2023-32205: Browser prompts could have been obscured by popups
+     CVE-2023-32206: Crash in RLBox Expat driver
+     CVE-2023-32207: Potential permissions request bypass via clickjacking
+     CVE-2023-32211: Content process crash due to invalid wasm code
+     CVE-2023-32212: Potential spoof due to obscured address bar
+     CVE-2023-32213: Potential memory corruption in FileReader::DoReadData()
+     CVE-2023-32215: Memory safety bugs fixed in Thunderbird 102.11
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 12 May 2023 17:11:29 +0200
  
  thunderbird (1:102.10.0-1~deb11u1) bullseye-security; urgency=medium