Merge version 102.9.0esr-1~deb11u1+rpi1 and 102.9.0esr-1~deb10u1 to produce 102.9...

diff --cc debian/changelog
index a69c1591fe384b137a3e0d30f84cf4db70bdb4d7,6378201ae6ca88f20a55a4ef547f00e177feec0d..3bade66df3069cfc5c7e8efa0f4d07967308e36f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,10 +1,42 @@@
- firefox-esr (102.9.0esr-1~deb11u1+rpi1) bullseye-staging; urgency=medium
++firefox-esr (102.9.0esr-1~deb10u1+rpi1) buster-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Mar 2023 04:52:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Mar 2023 03:48:54 +0000
 +
- firefox-esr (102.9.0esr-1~deb11u1) bullseye-security; urgency=medium
+ firefox-esr (102.9.0esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * Backport to buster.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 15 Mar 2023 12:53:54 +0100
+ 
+ firefox-esr (102.9.0esr-1) unstable; urgency=medium
  
    * New upstream release.
    * Fixes for mfsa2023-10, also known as:

diff --cc debian/patches/series
index bc62f6db015ebf5692ccdf365619acf740d1661c,738b4f4cf0d087df9971c7bfee28290450f86c83..7ede2060fe0510077e8c22d81036ed4e7e8569cd
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -22,10 -22,7 +22,14 @@@ debian-hacks/Work-around-bz-1775202-to-
  debian-hacks/Allow-to-override-rust-LTO-flag.patch
  debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch
  debian-hacks/Add-missing-webrtc-directory-for-ppc64el-bz-1775202.patch
+ 
+ # for building on debian buster
+ porting/build-with-fno-inline-on-i386-arm.patch
+ porting/build-i386-mismatched-type-unsigned-long-int.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
 +disable-more-armv7neon-stuff.patch
 +disable-jit.patch