Merge version 17.0.20+8-1~deb12u1+rpi1 and 17.0.20.1+1-1~deb12u1 to produce 17.0...

diff --cc debian/changelog
index 4a43b866208616751f042e75817739636964fee1,8a0640df979ba646d7616339c6f81af97e370623..b4dddc99c857664c4f8b6c9a8090b46fc273c480
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,33 +1,42 @@@
- openjdk-17 (17.0.20+8-1~deb12u1+rpi1) bookworm-staging; urgency=medium
++openjdk-17 (17.0.20.1+1-1~deb12u1+rpi1) bookworm-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>  Tue, 28 Jul 2026 19:36:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Sep 2026 05:07:57 +0000
++
+ openjdk-17 (17.0.20.1+1-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * Rebuild for bookworm.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 25 Aug 2026 09:29:15 +0200
+ 
+ openjdk-17 (17.0.20.1+1-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.20.1 release, build 1.
+     - CVEs:
+       + CVE-2026-61308
+       + CVE-2026-70907
+       + CVE-2026-60589
+ 
+  -- Vladimir Petko <vladimir.petko@canonical.com>  Wed, 19 Aug 2026 09:18:02 +1200
+ 
+ openjdk-17 (17.0.20+8-2) unstable; urgency=medium
+ 
+   [ Vladimir Petko ]
+   * d/t/jtreg-autopkgtest.in: Do not fail tests if ulimit can not be
+     set.
+   * d/t/problems.csv: Add test exclusions.
+   * d/rules: Disable riscv tests on Ubuntu.
+   * d/rules: Collect hotspot error and replay logs after jtreg tests.
+   * d/copyright-generator: Fix license SPDX identifiers.
+ 
+   [ Matthias Klose ]
+   * Build using GCC 16 on development releases.
+ 
+  -- Vladimir Petko <vladimir.petko@canonical.com>  Sun, 16 Aug 2026 13:58:03 +1200
  
  openjdk-17 (17.0.20+8-1~deb12u1) bookworm-security; urgency=medium
  

diff --cc debian/rules
Simple merge