From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Feb 2008 13:13:13 +0000 (+0100)
Subject: merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~98
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fe32e82bce354ffd2832acb39c253f90a9ffb5b9

merged from apt--mvo
---

fe32e82bce354ffd2832acb39c253f90a9ffb5b9
diff --cc debian/changelog
index 84f68dbf8,14abe5721..f1c694de2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,14 +1,16 @@@
 -apt (0.7.11) UNRELEASED; urgency=low
 +apt (0.7.9ubuntu7) hardy; urgency=low
 +
 +  * methods/connect.cc:
 +    - remember hosts with Resolve failures or connect Timeouts
 +      see https://wiki.ubuntu.com/NetworklessInstallationFixes
++  * cmdlines/apt-key:
++    - fix bug in the new apt-key update code that imports only
++      keys signed with the master key (thanks to cjwatson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 08 Feb 2008 11:38:35 +0100
 +
 +apt (0.7.9ubuntu6) hardy; urgency=low
  
 -  [ Colin Watson ]
 -  * apt-pkg/algorithms.cc:
 -    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
 -      true, the effect of the compatibility code was to require both of them
 -      to be set to false in order to disable list cleanup; this broke the
 -      installer. Instead, disable list cleanup if either of them is set to
 -      false.
 -  
 -  [ Michael Vogt ]
    * cmdline/apt-key:
      - add support for a master-keyring that contains signing keys
        that can be used to sign the archive signing keys. This should