Merge version 17.0.12+7-1+rpi1 and 17.0.12+7-2 to produce 17.0.12+7-2+rpi1

diff --cc debian/changelog
index 1894ef3eb955bbbf85df0a6cefa723163d4df9a0,ffeb270e364797d3b243785d213dc24bbdc4eb64..fe152f5e023a43b60ed3c39cf6e307a20b56eddf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,33 @@@
- openjdk-17 (17.0.12+7-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.12+7-2+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, 29 Jul 2024 13:16:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Aug 2024 07:20:24 +0000
++
+ openjdk-17 (17.0.12+7-2) unstable; urgency=medium
+ 
+   [ Vladimir Petko ]
+   * d/p/jdk-8312488.patch: Add upstream patch to resolve jpackage crash.
+   * d/copyright: Regenerate copyright.
+   * d/rules, d/t/*: Collate all excluded tests into d/t/problemlist.csv.
+   * d/rules: Enable fallback linker for Foreign Function and Memory API
+     on i386 and armhf.
+   * d/watch: Use fixed googletest version.
+   * d/p/jdk-8336529-proposed.patch: Fix time_t migration issue on armhf.
+     openjdk is unable to set file last modified timestamp.
+   * d/p/jdk-8334895-proposed.patch: Refresh patch.
+   * d/rules: Relax jtreg7 version condition for backports.
+   * d/rules, d/control.in: Depend on pkgconf rather than pkg-config in
+     bookworm and later releases. This resolves lintian warning
+     build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf.
+   * d/rules: Drop autotools-dev dependency for the modern debhelper.
+     This resolves obsolete autotools-dev dependency lintian warning.
+     See #844191.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Jul 2024 08:42:49 +0200
  
  openjdk-17 (17.0.12+7-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 1a7a360bd1c540b77dcb415a4a1b96f80c8097ab,033563235f471508eabcbed84be667c02a957d8b..d1bb92228dac89a632a46bba3cad617464437ef1
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -43,4 -43,5 +43,6 @@@ jdk-8295111.patc
  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