Merge version 21.0.7~8ea-1+rpi1 and 21.0.7+6-1 to produce 21.0.7+6-1+rpi1

diff --cc debian/changelog
index cd020d80622e1a9ba68452160dd8899fea68a6fd,36274a31ebe26390b2a2cd96697183df25dcb05b..3e8a5573e067d7eda13706daaa52ae8d63dd75f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,21 @@@
- openjdk-21 (21.0.7~8ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-21 (21.0.7+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>  Fri, 04 Apr 2025 14:48:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 May 2025 00:37:55 +0000
++
+ openjdk-21 (21.0.7+6-1) unstable; urgency=high
+ 
+   * OpenJDK 21.0.7 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 01:57:46 +0200
  
  openjdk-21 (21.0.7~8ea-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge