Merge version 8.4.20-1+rpi1 and 8.4.21-1 to produce 8.4.21-1+rpi1

diff --cc debian/changelog
index 936282b35623da7bdcf1c7c8cafb9b89de80b2c9,f8f488b811de7676fef2b238c2de456b19f8f3a2..76fe53c6cffaf8487131ef5a069b3b1bc0d48ee0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- php8.4 (8.4.20-1+rpi1) forky-staging; urgency=medium
++php8.4 (8.4.21-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 8.4.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 17 Oct 2025 01:23:38 +0000]
 +  * Fix fpu setting for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Apr 2026 19:54:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 May 2026 03:40:39 +0000
++
+ php8.4 (8.4.21-1) unstable; urgency=medium
+ 
+   * New upstream version 8.4.21 (Closes: #1136054)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 07 May 2026 20:39:09 +0200
  
  php8.4 (8.4.20-1) unstable; urgency=medium