Version in base suite: 2023.3 Base version: debian-archive-keyring_2023.3 Target version: debian-archive-keyring_2023.3+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/debian-archive-keyring/debian-archive-keyring_2023.3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/d/debian-archive-keyring/debian-archive-keyring_2023.3+deb12u1.dsc changelog | 7 +++++++ debian-archive-keyring.maintscript | 4 ++++ 2 files changed, 11 insertions(+) diff -Nru debian-archive-keyring-2023.3/debian/changelog debian-archive-keyring-2023.3+deb12u1/debian/changelog --- debian-archive-keyring-2023.3/debian/changelog 2023-03-28 20:31:07.000000000 +0000 +++ debian-archive-keyring-2023.3+deb12u1/debian/changelog 2023-07-30 19:30:54.000000000 +0000 @@ -1,3 +1,10 @@ +debian-archive-keyring (2023.3+deb12u1) bookworm; urgency=medium + + * Clean up leftover keyrings in trusted.gpg.d + * Adjust keyring cleanup versions for a stable update + + -- Jonathan Wiltshire Sun, 30 Jul 2023 20:30:54 +0100 + debian-archive-keyring (2023.3) unstable; urgency=medium * Reinstate cleanup of the APT keyrings for buster (Closes: #1033153) diff -Nru debian-archive-keyring-2023.3/debian/debian-archive-keyring.maintscript debian-archive-keyring-2023.3+deb12u1/debian/debian-archive-keyring.maintscript --- debian-archive-keyring-2023.3/debian/debian-archive-keyring.maintscript 2023-03-28 20:23:44.000000000 +0000 +++ debian-archive-keyring-2023.3+deb12u1/debian/debian-archive-keyring.maintscript 2023-07-30 19:30:54.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.3+deb12u1~~ +rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg 2023.3+deb12u1~~ +rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg 2023.3+deb12u1~~