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

diff --cc debian/changelog
index fe152f5e023a43b60ed3c39cf6e307a20b56eddf,2bfe3e5ca0b6952f6753a161fbcc2554e67713f6..033a6d57609af4f293c05d87c0254941058e5c06
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,19 +1,28 @@@
- openjdk-17 (17.0.12+7-2+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.13~6ea-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, 19 Aug 2024 07:20:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Sep 2024 08:54:03 +0000
++
+ openjdk-17 (17.0.13~6ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.13 early access, build 6.
+ 
+   [ Vladimir Petko ]
+   * d/copyright-generator/strip-common-licenses.sh: Add GPLv3 to the
+     list of common licenses.
+   * d/JB-*.override.in: Update lintian overrides.
+   * d/s/lintian-override: Add source-contains-prebuilt-javascript-object
+     due to LP: 2032992.
+   * d/p/jdk-8334895-proposed.patch: Fix typo in the patch description.
+   * d/t/problemlist.csv: Update problemlist.csv for July release
+   * d/t/jtreg-autopkgtest.{in,sh}: Increase jtreg test timeouts.
+   * Enable dtrace support.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Sep 2024 15:48:20 +0200
  
  openjdk-17 (17.0.12+7-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index d1bb92228dac89a632a46bba3cad617464437ef1,71da604b116ef308305ba95b931587842109a460..420f1637ebed402f1ea68aeae9395c7392dbd4db
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -37,12 -36,8 +36,9 @@@ update-permission-test.patc
  ldap-timeout-test-use-ip.patch
  test-use-ip-address.patch
  loong64-autoconf-config.diff
- googletest-version.diff
  jdk-8307977-proposed.patch
- jdk-8295111.patch
  jdk-8334502-proposed.patch
  jdk-8334895-proposed.patch
- jdk-8325567.patch
  jdk-8336529-proposed.patch
  jdk-8312488.patch
 +client_default.diff

diff --cc debian/rules
Simple merge