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

diff --cc debian/changelog
index 3eaff9c19e35680d1cc176aa9fa35bbbe163b9e6,21357ed2340dda71a1d99dd5c347effa82b0590a..69789dbd24c28af6c5dccba5835b584614882ada
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,35 +1,44 @@@
- openjdk-17 (17.0.10~6ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.10+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>  Sun, 07 Jan 2024 07:25:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Feb 2024 19:36:12 +0000
++
+ openjdk-17 (17.0.10+7-1) unstable; urgency=high
+ 
+   * OpenJDK 17.0.10 release, build 7.
+     - CVEs:
+       + CVE-2024-20918
+       + CVE-2024-20919
+       + CVE-2024-20921
+       + CVE-2024-20932
+       + CVE-2024-20945
+       + CVE-2024-20952
+     - Security fixes:
+       + JDK-8276123, JDK-8316613: ZipFile::getEntry will not return a file entry
+         when there is a directory entry of the same name within a Zip File.
+       + JDK-8308204: Enhanced certificate processing.
+       + JDK-8314295: Enhance verification of verifier.
+       + JDK-8314307: Improve loop handling.
+       + JDK-8314468: Improve Compiler loops.
+       + JDK-8316976: Improve signature handling.
+       + JDK-8317547: Enhance TLS connection support.
+ 
+   [ Vladimir Petko ]
+   * d/t/jtreg-autopkgtest.sh: Regenerate test script.
+   * Generate d/watch to cope with early access and release builds.
+   * d/rules: Trim trailing whitespaces from debian/control.
+ 
+   [ Matthias Klose ]
+   * Build again zero on amd64 (accidental change in 6ea-1).
+ 
+   [ Pushkar Kulkarni ]
+   * Minor improvements to the copyright-generator.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Jan 2024 12:09:47 +0100
  
  openjdk-17 (17.0.10~6ea-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge