Merge version 17.0.14+7-1~deb12u1+rpi1 and 17.0.15+6-1~deb12u1 to produce 17.0.15...

diff --cc debian/changelog
index e9fd382f30e5b4b880b1c8822c62cd53b18888d2,7d17bb177bfbe3f9a6eab4d90bb6e3b10bddfb91..eeea607dc5bad17957e53ef276e66ee75aa601c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,37 +1,46 @@@
- openjdk-17 (17.0.14+7-1~deb12u1+rpi1) bookworm-staging; urgency=medium
++openjdk-17 (17.0.15+6-1~deb12u1+rpi1) bookworm-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>  Wed, 05 Feb 2025 08:23:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 04 May 2025 23:06:28 +0000
 +
- openjdk-17 (17.0.14+7-1~deb12u1) bookworm-security; urgency=medium
+ openjdk-17 (17.0.15+6-1~deb12u1) bookworm-security; urgency=medium
  
-   * Rebuild for Bookworm
+   * Rebuild for bookworm
  
-  -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 31 Jan 2025 00:01:36 +0100
+  -- Moritz Mühlenhoff <jmm@debian.org>  Thu, 01 May 2025 10:40:21 +0200
+ 
+ openjdk-17 (17.0.15+6-1) unstable; urgency=high
+ 
+   * OpenJDK 17.0.15 release, build 6.
+     - Addresses CVE-2025-30698, CVE-2025-30691, CVE-2025-21587.
+ 
+   * Honour DEB_BUILD_OPTIONS=parallel=N while running jtreg tests (Helmut
+     Grohne). Addresses: #1095920.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Apr 2025 02:05:43 +0200
+ 
+ openjdk-17 (17.0.15~5ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.14 early access, build 5.
+ 
+   [ Vladimir Petko ]
+   * d/t/problems.csv: Disable tests failing due to upstream bugs.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Thu, 27 Mar 2025 13:35:58 +0100
+ 
+ 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