Merge version 2.38.4-2+rpi1 and 2.38.5-1 to produce 2.38.5-1+rpi1

diff --cc debian/changelog
index cfe49fe29df4cba3a124b8b98a63a927b0a3777b,bbab9f6e5704a3181d0b87af1b31f4d6adf3ab66..208b7c74f79df0d65a56011c5a1909a50fe17525
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
- webkit2gtk (2.38.4-2+rpi1) bookworm-staging; urgency=medium
++webkit2gtk (2.38.5-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Feb 2023 12:46:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 02:41:35 +0000
++
+ webkit2gtk (2.38.5-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * The WebKitGTK security advisory WSA-2023-0002 lists the following
+     security fixes in the latest versions of WebKitGTK:
+     - CVE-2023-23529 (fixed in 2.38.5).
+   * Remove debian/patches/fix-nonunified-build.patch.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 15 Feb 2023 18:10:55 +0100
  
  webkit2gtk (2.38.4-2) unstable; urgency=high