Merge version 17.0.15~5ea-1+rpi1 and 17.0.15+6-1 to produce 17.0.15+6-1+rpi1

diff --cc debian/changelog
index 437f13444e6a2a25ccec3e46ef8f08544340ea28,d346ddcee4d0a02f4c09a97597f1b5b679dc413d..2dcf146eb01d3136d0ee1d3369ba94d4e49675be
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,21 @@@
- openjdk-17 (17.0.15~5ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.15+6-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>  Thu, 03 Apr 2025 01:40:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 May 2025 08:59:55 +0000
++
+ 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
  

diff --cc debian/rules
Simple merge