diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | scripts/gutsy | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 15af0cd..01efbc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,16 @@ debootstrap (1.0.30) unstable; urgency=low * Don't use the Build-Essential: yes field in Debian, use the build-essential package. Closes: #619700. + [ Colin Watson ] + * If ubuntu-keyring is installed, check Release signatures against it when + bootstrapping Ubuntu gutsy and later. + * Recommend ubuntu-keyring rather than debian-archive-keyring on + Ubuntu-derived systems. + + -- Colin Watson <cjwatson@debian.org> Fri, 20 May 2011 09:45:48 +0100 + +debootstrap (1.0.30) unstable; urgency=low + [ Joey Hess ] * Recommend debian-archive-keyring, and if it is installed, default to checking gpg signatures of the Release file against it diff --git a/debian/control b/debian/control index ef59108..8d0e26e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/d-i/debootstrap.git Package: debootstrap Architecture: all Depends: ${misc:Depends}, wget -Recommends: gnupg, debian-archive-keyring +Recommends: gnupg, ${keyring} Description: Bootstrap a basic Debian system debootstrap is used to create a Debian base system from scratch, without requiring the availability of dpkg or apt. It does this by diff --git a/debian/rules b/debian/rules index cc9c27c..314bac7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,11 @@ #! /usr/bin/make -f +ifeq (0,$(shell dpkg-vendor --derives-from Ubuntu; echo $$?)) + KEYRING := ubuntu-keyring +else + KEYRING := debian-archive-keyring +endif + %: dh $@ @@ -27,3 +33,6 @@ override_dh_auto_install: debian/debootstrap-udeb/usr/share/debootstrap/scripts/stable \ debian/debootstrap-udeb/usr/share/debootstrap/scripts/testing \ debian/debootstrap-udeb/usr/share/debootstrap/scripts/unstable + +override_dh_gencontrol: + dh_gencontrol -- -Vkeyring=$(KEYRING) diff --git a/scripts/gutsy b/scripts/gutsy index 24c6a3f..705cac5 100644 --- a/scripts/gutsy +++ b/scripts/gutsy @@ -20,6 +20,7 @@ mirror_style release download_style apt finddebs_style from-indices variants - buildd fakechroot minbase +keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg if doing_variant fakechroot; then test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started" |