Merge version 2.40.5-1+rpi1 and 2.42.1-1 to produce 2.42.1-1+rpi1

diff --cc debian/changelog
index 4b9da8681375f612aac110691a977032f8bfd43b,622f164cf0e77ffcc7c8d7f55fd6962e71946abd..fc880cbed0cb0c39fd788f7d129e8ada10d49ce2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,36 +1,47 @@@
- webkit2gtk (2.40.5-1+rpi1) trixie-staging; urgency=medium
++webkit2gtk (2.42.1-1+rpi1) trixie-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)
 +
 +  [changes introuced in 2.40.0-3+rpi1 by Peter Michael Green]
 +  * Disable webgl on armhf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 17 Sep 2023 07:39:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Oct 2023 10:15:11 +0000
++
+ webkit2gtk (2.42.1-1) unstable; urgency=high
+ 
+   * New upstream release.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 27 Sep 2023 10:49:22 +0200
+ 
+ webkit2gtk (2.42.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bring all changes from the 2.41 (experimental) branch.
+   * debian/gbp.conf:
+     - Update upstream branch name.
+   * debian/control.in:
+     - Remove the minimum versions of all build dependencies in the cases
+       where they are very old.
+     - Add build dependency on libjxl-dev, JPEGXL is now enabled by
+       default.
+     - Require CMake 3.16
+   * debian/control-common.in:
+     - Add dependency on libgles2. This is no longer detected automatically
+       because it's loaded at runtime by libepoxy (see #1050777).
+   * debian/source/lintian-overrides:
+     - Update source-is-missing overrides.
+   * debian/libwebkit2gtk-4.0-37.symbols:
+     - Update symbols.
+   * debian/rules:
+     - Use --max-parallel=2 in Debian mipsel builds again.
+     - Don't build jpegxl support on Ubuntu yet (it's still in universe)
+       (Jeremy Bicha).
+   * debian/copyright:
+     - Update copyright information of all files.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 15 Sep 2023 14:49:49 +0200
  
  webkit2gtk (2.40.5-1) unstable; urgency=high
  

diff --cc debian/rules
Simple merge