Merge version 115.9.1esr-1~deb12u1+rpi1 and 115.12.0esr-1~deb12u1 to produce 115...

diff --cc debian/changelog
index c4beb5ff447d1b28d8d7e6da7ff764ecb5e5ce18,d91ac883afe23482886ac6c5ff89790c2daef23d..6be128f83896fd4ab08463429dd9c7f53da2915f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,29 +1,64 @@@
- firefox-esr (115.9.1esr-1~deb12u1+rpi1) bookworm-staging; urgency=medium
++firefox-esr (115.12.0esr-1~deb12u1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 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 introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
 +  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes brought over from thunderbird 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 brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Disable more armv7/neon stuff.
 +
 +  [changes introduced in 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
 +
 +  [changes introduced in 115.3.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable conflicting include in js/src/jit/shared/AtomicOperations-shared-jit.cpp
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Apr 2024 08:12:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Jun 2024 21:58:57 +0000
++
+ firefox-esr (115.12.0esr-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-26, also known as:
+     CVE-2024-5702, CVE-2024-5688, CVE-2024-5690, CVE-2024-5691,
+     CVE-2024-5693, CVE-2024-5696, CVE-2024-5700.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Jun 2024 05:41:00 +0900
+ 
+ firefox-esr (115.11.0esr-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-22, also known as:
+     CVE-2024-4367, CVE-2024-4767, CVE-2024-4768, CVE-2024-4769,
+     CVE-2024-4770, CVE-2024-4777.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 15 May 2024 05:05:03 +0900
+ 
+ firefox-esr (115.10.0esr-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-19, also known as:
+     CVE-2024-3852, CVE-2024-3854, CVE-2024-3857, CVE-2024-2609,
+     CVE-2024-3859, CVE-2024-3861, CVE-2024-3302, CVE-2024-3864.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 17 Apr 2024 05:35:49 +0900
  
  firefox-esr (115.9.1esr-1~deb12u1) bookworm-security; urgency=medium
  

diff --cc gfx/qcms/src/lib.rs
Simple merge