Merge version 21.0.4+7-2+rpi1 and 21.0.5~6ea-1 to produce 21.0.5~6ea-1+rpi1

diff --cc debian/changelog
index 49f4042dcfe752898890074af813c8ae9529bf6a,8ccf3c3130ee5947fd0ca4f61b8b6d4df5751027..6061219df537a0249735747b84c0dced21984686
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,32 +1,41 @@@
- openjdk-21 (21.0.4+7-2+rpi1) trixie-staging; urgency=medium
++openjdk-21 (21.0.5~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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 15 Aug 2024 16:30:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Sep 2024 16:05:40 +0000
++
+ openjdk-21 (21.0.5~6ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 21.0.5 early access, build 6.
+ 
+   [ Vladimir Petko ]
+   * d/p/reproducible-properties-timestamp.diff: Use PrivilegedAction
+     to avoid SecurityManager exception.
+   * Enable dtrace support.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Sep 2024 15:29:08 +0200
+ 
+ openjdk-21 (21.0.4+7-3) unstable; urgency=medium
+ 
+   [ Vladimir Petko ]
+   * d/copyright-generator/strip-common-licenses.sh: Add GPLv3 to the
+     list of common licenses.
+   * d/p/jdk-8334895-proposed.patch: Fix typo in the patch description.
+   * d/JB-*.overrides.in: Update lintian overrides.
+   * d/s/lintian-override: Add source-contains-prebuilt-javascript-object
+     due to LP: 2032992.
+   * d/control.in: Remove duplicate Provides.
+   * d/control: Regenerate.
+   * d/t/problemlist.csv: Update problemlist.csv for July release
+   * d/t/jtreg-autopkgtest.{in,sh}: Increase jtreg test timeouts.
+ 
+   [ Emmanuel Bourg ]
+   * Restore and update the reproducible-properties-timestamp patch.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Sat, 10 Aug 2024 10:08:49 +0200
  
  openjdk-21 (21.0.4+7-2) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge