Merge version 8.2.7-1~deb12u1+rpi1 and 8.2.18-1 to produce 8.2.18-1+rpi1

diff --cc debian/changelog
index a8dbcf3ee9fe089e0373afd122b1a007196d1992,b43c0f0ef19d84f6b0d71000b0d5786b7c08f792..a6698472c3a0c5fed1afca6b9eb786d9ef320a18
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,101 +1,108 @@@
- php8.2 (8.2.7-1~deb12u1+rpi1) bookworm-staging; urgency=medium
++php8.2 (8.2.18-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 8.2.7-1~deb12u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Jul 2023 18:02:54 +0000]
 +  * Fix fpu setting for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Jul 2023 18:02:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Jun 2024 20:58:55 +0000
 +
- php8.2 (8.2.7-1~deb12u1) bookworm-security; urgency=high
+ php8.2 (8.2.18-1) unstable; urgency=medium
  
-   * No change upload to bookworm-security
+   * New upstream version 8.2.18
  
-  -- Ondřej Surý <ondrej@debian.org>  Fri, 09 Jun 2023 21:37:27 +0200
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 11 Apr 2024 22:30:26 +0200
+ 
+ php8.2 (8.2.17-1) unstable; urgency=medium
+ 
+   [ Ondřej Surý ]
+   * New upstream version 8.2.17
+   * Remove hardcoded dependency on libmagic1 (Closes: #1065985)
+   * Just don't set PHP extra version at all - it makes a little
+     sense when we are just updating upstream versions
+ 
+   [ Andrey Rakhmatullin ]
+   * Fix FTBFS with -Werror=implicit-function-declaration (Closes: #1066234).
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 16 Mar 2024 09:29:51 +0100
+ 
+ php8.2 (8.2.16-2) unstable; urgency=medium
+ 
+   * Regenerate d/tests for correct PHP version (Closes: #1064174)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sun, 18 Feb 2024 08:09:07 +0100
+ 
+ php8.2 (8.2.16-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.16
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 16 Feb 2024 16:33:12 +0100
+ 
+ php8.2 (8.2.15-1) unstable; urgency=medium
+ 
+   [ Ondřej Surý ]
+   * New upstream version 8.2.15
+ 
+   [ Athos Ribeiro ]
+   * Fix PHP_EXTRA_VERSION setting
+   * Test the PHP_EXTRA_VERSION setting
+   * Move disabling the upstream GC routine to a patch (Closes: #831752)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 20 Jan 2024 14:05:48 +0100
+ 
+ php8.2 (8.2.14-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.14
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 21 Dec 2023 21:08:22 +0100
+ 
+ php8.2 (8.2.13-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.13
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 24 Nov 2023 09:40:22 +0100
+ 
+ php8.2 (8.2.12-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.12
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 26 Oct 2023 19:23:09 +0200
+ 
+ php8.2 (8.2.11-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.11
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 06 Oct 2023 11:32:59 +0200
+ 
+ php8.2 (8.2.10-2) unstable; urgency=medium
+ 
+   * Add systemtap-sdt-dev on all architectures (Closes: #1051246)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Tue, 05 Sep 2023 07:43:15 +0200
+ 
+ php8.2 (8.2.10-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.10
+   * Enable DTrace on all architectures
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 02 Sep 2023 08:31:05 +0200
+ 
+ php8.2 (8.2.9-2) unstable; urgency=medium
+ 
+   * Pull upstream patch to revert behaviour of receiving SIGCHLD signals
+     back to the behaviour before 8.1.22. (GH#2007)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Tue, 29 Aug 2023 12:28:29 +0200
+ 
+ php8.2 (8.2.9-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.9
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Wed, 16 Aug 2023 21:39:43 +0200
+ 
+ php8.2 (8.2.8-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.8
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 08 Jul 2023 08:49:00 +0200
  
  php8.2 (8.2.7-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge