diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-28 18:06:22 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-28 18:06:22 +0000 |
| commit | 4e2ded43a51b4f5522d3dd3cdfb4625a3a715966 (patch) | |
| tree | 3670d2d96adcc65e19d7407d31fc22acd9b04ea3 /debian | |
| parent | 29ba053e05b1a496500036dbd667002d1b8b5ec2 (diff) | |
Merge with mainline
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-98
Install only one keyring on each branch (Closes: #316119)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index fd5959423..3279c859e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.6.39) unstable; urgency=low the patch, thanks to Colin Watson for testing it. - better report network timeouts from the methods to the acuire code, only timeout once per sources.list line + * Install only one keyring on each branch (Closes: #316119) -- diff --git a/debian/rules b/debian/rules index ee02baeb6..6b532cc53 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/*.gpg debian/$@/usr/share/$@ + cp share/debian-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog |