summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-01-04 13:45:14 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-01-04 13:45:14 +0100
commitc24f6ce22cd6720004addad2e3382b3caa6b1b7c (patch)
treef9b6374f21ab733a633b52e0fc26bb4dac461aca /debian
parent52643bec17df4e36a9bd27183886e2c0c7a8ebd8 (diff)
add TrustedParts so in the future new keyrings can just be dropped
into /etc/apt/trusted.gpg.d/ which eliminates the need to have gpg installed to add keys to APTs trusted keyring (with apt-key) (Closes #304846) - Thanks to Timo Weingärtner & Peter Palfrader for providing different patchs/ideas for this!
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs
index fb6716c35..66556e453 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -5,6 +5,7 @@ etc/apt
etc/apt/apt.conf.d
etc/apt/preferences.d
etc/apt/sources.list.d
+etc/apt/trusted.gpg.d
etc/logrotate.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
diff --git a/debian/changelog b/debian/changelog
index f70c5735f..fca8d3ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,10 @@ apt (0.7.26) UNRELEASED; urgency=low
the keyring so we don't need to ship our own version
* cmdline/apt-key:
- errors out if wget is not installed (Closes: #545754)
+ - add --keyring option as we have now possibly many
+ * methods/gpgv.cc:
+ - pass all keyrings (TrustedParts) to gpgv instead of
+ using only one trusted.gpg keyring (Closes: #304846)
-- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100