Merge version 5.15.15+dfsg-2+rpi1 and 5.15.15+dfsg-4 to produce 5.15.15+dfsg-4+rpi1

diff --cc debian/changelog
index e58662221854ad50011813d2080c3b3608bff922,7011afd66401c6378a60e12923331600c3b9b5b5..42ba6779e95c350580a919ca2a75e8b722a71f63
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,24 +1,37 @@@
- qtbase-opensource-src (5.15.15+dfsg-2+rpi1) trixie-staging; urgency=medium
++qtbase-opensource-src (5.15.15+dfsg-4+rpi1) trixie-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
 +  [changes introduced in 5.15.13+dfsg-2+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on libts-dev to avoid unwanted extra files.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 06 Nov 2024 01:03:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Feb 2025 20:46:41 +0000
++
+ qtbase-opensource-src (5.15.15+dfsg-4) unstable; urgency=medium
+ 
+   * Fix containsTLDEntry() crash when tldChunkCount >= 3 (closes: #1095423).
+     - Thanks to Timo Röhling for help with debugging this!
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 08 Feb 2025 19:24:33 +0300
+ 
+ qtbase-opensource-src (5.15.15+dfsg-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Enable the Vulkan support on all the architectures (i.e. not only on
+     Linux), as vulkan-loader is portable, and now available also on non-Linux
+     architectures in Debian:
+     - remove the linux-any limitation for the libvulkan-dev build and runtime
+       dependency
+     - remove the linux-any limitation for the vulkan-related symbols in
+       libqt5gui5t64.symbols
+     - remove the linux-any limitation for the vulkan-related files in install
+       files
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 07 Feb 2025 07:20:36 +0100
  
  qtbase-opensource-src (5.15.15+dfsg-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 310ae68224db6e7fb8fee923c3fe146f503edf5f,02c3e2d2fd3faa9931c87360b50fd5cb1f0dfa94..882b447feede017fe0b3844ae67973e93b9078fd
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -30,4 -30,4 +30,5 @@@ path_max.dif
  qstorageinfo_linux.diff
  cross_build_mysql.diff
  cast_types_for_egl_x11_test.diff
+ containsTLDEntry.diff
 +modify-configure.json-to-disable-neon.patch