Package: debian-archive-keyring-udeb Version: 2007.02.19 Severity: normal Tags: patch d-i
We're changing d-i to use this udeb, and in the process we've decided to make it easy for derived distributions to replace the keyring file with their own keyring. So d-i will continue to use /usr/share/keyrings/archive.gpg, as it does now, and this udeb should symlink that to point to the real debian-archive-keyring.gpg, IFF archive.gpg does not already exist. (If it does already exist, some derived distro presumably got there first and overrode it to point to a different keyring.) I've attached a patch that adds a postinst to the udeb to handle this. It's fully tested and I'd appreciate a prompt upload as it's blocking this small transition and associated bug fixes in d-i. I also took the liberty of cleaning up your udeb packaging slightly. (Though converting the package to use debhelper would have cleaned it up enormously, I haven't done so, though I'd be happy to do that if you'd like.) I also included a fix for #423422. -- see shy jo
diff -Nru /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/changelog /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/changelog --- /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/changelog 2007-02-19 04:15:08.000000000 -0500 +++ /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/changelog 2007-05-11 15:02:24.000000000 -0400 @@ -1,3 +1,13 @@ +debian-archive-keyring (2007.02.20) UNRELEASED; urgency=low + + * Add a postinst to the udeb that creates an archive.gpg symlink + if one doesn't yet exist. + * Clean up use of dpkg-gencontrol, removing obsolete workaround. + * Remove removed-keys keyring from udeb to save space. Closes: #423422 + * Set udeb priority to optional to match overrides. + + -- Joey Hess <[EMAIL PROTECTED]> Fri, 11 May 2007 14:56:23 -0400 + debian-archive-keyring (2007.02.19) unstable; urgency=low * added Etch stable release key (ID: ADB11277) (closes: #410788) diff -Nru /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/control /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/control --- /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/control 2006-11-21 10:35:23.000000000 -0500 +++ /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/control 2007-05-11 15:02:12.000000000 -0400 @@ -12,7 +12,7 @@ contains the archive keys used for that. Package: debian-archive-keyring-udeb -Priority: standard +Priority: optional Architecture: all Section: debian-installer Recommends: gpgv-udeb diff -Nru /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/debian-archive-keyring-udeb.postinst --- /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/debian-archive-keyring-udeb.postinst 1969-12-31 19:00:00.000000000 -0500 +++ /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/debian-archive-keyring-udeb.postinst 2007-05-11 14:59:28.000000000 -0400 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +DIR=/usr/share/keyrings +if [ ! -e $DIR/archive.gpg ]; then + ln -s debian-archive-keyring.gpg $DIR/archive.gpg +fi diff -Nru /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/rules /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/rules --- /home/joey/tmp/N7GeMpgppN/debian-archive-keyring-2007.02.19/debian/rules 2006-01-18 17:20:17.000000000 -0500 +++ /home/joey/tmp/WqGYdIyQ85/debian-archive-keyring-2007.02.20/debian/rules 2007-05-11 15:00:48.000000000 -0400 @@ -49,12 +49,9 @@ $(install_dir) debian/debian-archive-keyring-udeb/usr/share/keyrings/ $(install_file) keyrings/debian-archive-keyring.gpg debian/debian-archive-keyring-udeb/usr/share/keyrings/ - $(install_file) keyrings/debian-archive-removed-keys.gpg debian/debian-archive-keyring-udeb/usr/share/keyrings/ + install -m 755 debian/debian-archive-keyring-udeb.postinst debian/debian-archive-keyring-udeb/DEBIAN/postinst - # Don't let dpkg-gencontrol write incorrect guesses to debian/files. - # Instead, register the udeb manually. - dpkg-gencontrol -pdebian-archive-keyring-udeb -Tdebian/debian-archive-keyring-udeb.substvars -Pdebian/debian-archive-keyring-udeb -isp -fdebian/files~ - dpkg-distaddfile debian-archive-keyring-udeb_$(VERSION)_all.udeb debian-installer standard + dpkg-gencontrol -ndebian-archive-keyring-udeb_$(VERSION)_all.udeb -pdebian-archive-keyring-udeb -Tdebian/debian-archive-keyring-udeb.substvars -Pdebian/debian-archive-keyring-udeb -isp chown -R root.root debian/debian-archive-keyring-udeb chmod -R go=rX debian/debian-archive-keyring-udeb dpkg --build debian/debian-archive-keyring-udeb ../debian-archive-keyring-udeb_$(VERSION)_all.udeb
signature.asc
Description: Digital signature
