Merge version 17.0.14+7-1+rpi1 and 17.0.15~4ea-1 to produce 17.0.15~4ea-1+rpi1

diff --cc debian/changelog
index 6e0a413b9a52069c36b48b242d2b29f689a1499c,e534428565c47334a4ae94c4e5e61b8cd9d946aa..b6bec1cb11482022b2a40bb8a953bae730881910
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,21 @@@
- openjdk-17 (17.0.14+7-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.15~4ea-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes taken from 17.0.4+8-1~deb11u1+rpt1 by Serge Schneider]
 +  * Build with client jvm variant
 +    - https://github.com/raspberrypi/linux/issues/3306#issuecomment-1030781000
 +  * Default to client jvm on armhf
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2025 09:13:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Mar 2025 03:43:45 +0000
++
+ openjdk-17 (17.0.15~4ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.14 early access, build 4.
+ 
+   [ Vladimir Petko ]
+   * d/rules: Disable dtrace on jammy armhf (was not enabled before and cannot
+     be built due to a GCC ICE (see LP #2091225).
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Sat, 15 Mar 2025 09:45:37 +0100
  
  openjdk-17 (17.0.14+7-1) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge