Merge with mainline

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-98
   Install only one keyring on each branch (Closes: #316119)

diff --git a/debian/changelog b/debian/changelog
index fd59594..3279c85 100644 (file)
--- 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 ee02bae..6b532cc 100755 (executable)
--- 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