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

diff --cc debian/changelog
index f008f13f462e25f791f97a15f5cf424c77dfc2e1,bd6d91d4515c701aa490769be0e5f7f311a2e8d9..6e0a413b9a52069c36b48b242d2b29f689a1499c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,22 +1,31 @@@
- openjdk-17 (17.0.14~6ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.14+7-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>  Tue, 31 Dec 2024 04:20:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2025 09:13:06 +0000
++
+ openjdk-17 (17.0.14+7-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.14 release, build 7. Release notes:
+     https://mail.openjdk.org/pipermail/jdk-updates-dev/2025-January/040827.html
+ 
+     - CVEs:
+       + CVE-2025-21502 - 8330045: Enhance array handling.
+ 
+   [ Vladimir Petko ]
+   * d/rules: Dump complete hs_err_pid and replay_pid logs to stdout.
+   * d/t/problems.csv: Add openjdk-24 and openjdk-25 to the problems.csv.
+   * d/rules: Create link to jquery-3.7.1.min.js instead of jquery-3.6.1.min.js
+     (LP: #2095455).
+   * d/copyright: Regenerate.
+ 
+   [ Matthias Klose ]
+   * d/rules: Also dump logs for zero builds and for build failures.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 22 Jan 2025 10:17:58 +0100
  
  openjdk-17 (17.0.14~6ea-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge