From: Matt Zimmerman <matt.zimmerman@canonical.com>
Date: Wed, 6 Apr 2005 16:44:08 +0000 (+0000)
Subject: Merge apt--mvo--0
X-Git-Tag: 0.7.24ubuntu1~337
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3e79ad48cd780defe869c6caf47dd338a9f5b984

Merge apt--mvo--0
Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14
   * changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
   * merged with matts tree

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
   * whitespace change to add incomplete log for last patch

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
   * honor "Acquire::gpgv::Options" in apt-cdrom too

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
   * corrected a incorrect use of string().c_str() (thanks to mdz!)
---

3e79ad48cd780defe869c6caf47dd338a9f5b984