The following commit has been merged in the master branch:
commit b6f741f4a0334d8bcc6ab3ee477786f04ad0c4f5
Author: James Vega <[email protected]>
Date: Wed Jul 27 23:05:32 2011 -0400
chdist: Copy archive keyrings to etc/apt/trusted.gpg.d
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 6b7b1f4..c7b57a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low
directory structure. (Closes: #528274, LP: #566682)
+ When multiple binary versions exist, use newest version for
compare-src-bin-*.
+ + Copy archive keyrings to etc/apt/trusted.gpg.d.
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 562d8be..300ad73 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -129,6 +129,7 @@ License, or (at your option) any later version.
use strict;
use warnings;
use feature 'switch';
+use File::Copy qw(cp);
use File::Path qw(make_path);
use File::Basename;
use Getopt::Long qw(:config require_order);
@@ -311,8 +312,8 @@ sub dist_create
}
make_path($datadir);
foreach my $d (('/etc/apt', '/etc/apt/apt.conf.d',
'/etc/apt/preferences.d',
- '/var/lib/apt/lists/partial',
'/var/cache/apt/archives/partial',
- '/var/lib/dpkg')) {
+ '/etc/apt/trusted.gpg.d', '/var/lib/apt/lists/partial',
+ '/var/cache/apt/archives/partial', '/var/lib/dpkg')) {
make_path("$dir/$d");
}
@@ -358,8 +359,14 @@ Dir "$dir";
Dir::State::status "$dir/var/lib/dpkg/status";
EOF
close FH;
- print "Now edit $dir/etc/apt/sources.list\n";
- print "Then run chdist apt-get $dist update\n";
+ foreach my $keyring (qw(debian-archive-keyring.gpg
+ debian-archive-removed-keys.gpg
+ ubuntu-archive-keyring.gpg
+ ubuntu-archive-removed-keys.gpg)) {
+ cp("/usr/share/keyrings/$keyring", "$dir/etc/apt/trusted.gpg.d/");
+ }
+ print "Now edit $dir/etc/apt/sources.list\n" unless $version;
+ print "Run chdist apt-get $dist update\n";
print "And enjoy.\n";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
