diff -Nru debian-archive-keyring-2023.3ubuntu1/debian/changelog debian-archive-keyring-2023.4ubuntu1/debian/changelog
--- debian-archive-keyring-2023.3ubuntu1/debian/changelog	2023-04-01 13:15:43.000000000 +0000
+++ debian-archive-keyring-2023.4ubuntu1/debian/changelog	2023-07-31 06:55:32.000000000 +0000
@@ -1,3 +1,20 @@
+debian-archive-keyring (2023.4ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    + Do not trust debian archive keys by default, and instead ship those
+      keys in usr/share/keyrings. On Ubuntu, this package is mostly used for
+      validating chroots when debootstrapping Debian using
+      /usr/share/keyrings/debian-archive-keyring.gpg.
+    + Document the fact that the keys are disabled in APT for Ubuntu
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Jul 2023 08:55:32 +0200
+
+debian-archive-keyring (2023.4) unstable; urgency=medium
+
+  * Clean up leftover keyrings in trusted.gpg.d
+
+ -- Jonathan Wiltshire <jmw@debian.org>  Sun, 30 Jul 2023 20:24:09 +0100
+
 debian-archive-keyring (2023.3ubuntu1) lunar; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru debian-archive-keyring-2023.3ubuntu1/debian/debian-archive-keyring.maintscript debian-archive-keyring-2023.4ubuntu1/debian/debian-archive-keyring.maintscript
--- debian-archive-keyring-2023.3ubuntu1/debian/debian-archive-keyring.maintscript	2023-03-28 20:23:44.000000000 +0000
+++ debian-archive-keyring-2023.4ubuntu1/debian/debian-archive-keyring.maintscript	2023-07-30 19:17:19.000000000 +0000
@@ -15,3 +15,7 @@
 rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg 2022.1~~
 rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bullseye-security-automatic.gpg 2022.1~~
 rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg 2022.1~~
+# These get left over from the bullseye version, after which they became fragments
+rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg 2023.4~~
+rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg 2023.4~~
+rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg 2023.4~~