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

diff --cc debian/changelog
index 080bcbf168119175e188dac13253de08dd0842de,cc292c45d7d132f39bb4419e5892176c88288ba0..1894ef3eb955bbbf85df0a6cefa723163d4df9a0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- openjdk-17 (17.0.12~6ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.12+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>  Mon, 15 Jul 2024 05:10:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 29 Jul 2024 13:16:58 +0000
++
+ openjdk-17 (17.0.12+7-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.12 release, build 7.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Jul 2024 13:02:09 +0200
  
  openjdk-17 (17.0.12~6ea-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge