From: Christian Perrier Date: Sat, 5 Mar 2005 09:28:33 +0000 (+0000) Subject: Merge with matt X-Git-Tag: 0.7.24ubuntu1~348^2~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2c01f1c077870be1fb00663fc6bb80366498efab?hp=--cc Merge with matt Patches applied: * apt@packages.debian.org/apt--main--0--patch-59 Open 0.6.32 * apt@packages.debian.org/apt--main--0--patch-60 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-61 Add missing whitespace in new Debug::Acquire::gpgv output * apt@packages.debian.org/apt--main--0--patch-62 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-63 Open 0.6.34 * apt@packages.debian.org/apt--main--0--patch-64 Add missing semicolon in configure-index (Debian #295773) * apt@packages.debian.org/apt--main--0--patch-65 Update build-depends on gettext to 0.12 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-12 * star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-13 * commented the ftp no_proxy unseting in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-14 * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-15 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * added support for "Acquire::gpgv::options" in methods/gpgv.cc * michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0 tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1 * slightly cosmetic change in methods/gpgv.cc * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2 * merge with matts tree, added documentation for the gpgv stuff * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3 * added gpgv::Options to configure-index * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4 * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5 * fix for apt-get update removing the cdroms Release.gpg files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6 * path scoring changed, the non-symlink path is scored highest --- 2c01f1c077870be1fb00663fc6bb80366498efab