From: Michael Vogt Date: Wed, 19 Oct 2005 20:03:54 +0000 (+0000) Subject: * merged with mainline X-Git-Tag: 0.7.24ubuntu1~245^2~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f732cca1a45def35db5f88444b22c1485125bfde?ds=inline;hp=-c * merged with mainline Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-105 Proofread by Fred Bothamy * bubulle@debian.org--2005/apt--main--0--patch-106 Merge with mvo * bubulle@debian.org--2005/apt--main--0--patch-107 Italian translation corrected * bubulle@debian.org--2005/apt--main--0--patch-108 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-109 Italian translation completed * bubulle@debian.org--2005/apt--main--0--patch-110 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-111 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-112 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-113 Silly update to French translation (testing) * bubulle@debian.org--2005/apt--main--0--patch-114 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-115 Basque translation completed * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62 * leak fix for debian #250583 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65 * inital support for "apt-get source -t dist" (but no downgrades yet * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66 * full support for apt-get source -t now (and honor pining too) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67 * added APT::Authentication::Trust-CDROM option * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68 * fix a crash in apt-ftparchive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69 * sparc64 alignment fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70 * fix segfault when there is no Archive for a VerFile * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71 * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72 * corrections in the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73 * init the default ScreenWidth to 79 columns by default (Closes: #324921) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74 apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75 * seting section to "admin" to match override file * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76 * finalized the changelog * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index --- f732cca1a45def35db5f88444b22c1485125bfde diff --combined apt-pkg/deb/debmetaindex.cc index 8dfbf7aff,ed5cb80d1..ea53a847e --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@@ -157,14 -157,6 +157,14 @@@ bool debReleaseIndex::GetIndexes(pkgAcq ComputeIndexTargets(), new indexRecords (Dist)); + // Queue the translations + for (vector::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) { + + debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section); + i.GetIndexes(Owner); + } + return true; } @@@ -173,6 -165,10 +173,10 @@@ bool debReleaseIndex::IsTrusted() cons string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; + if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(URI.substr(0,strlen("cdrom:")) == "cdrom:") + return true; + if (FileExists(VerifiedSigFile)) return true; return false; @@@ -185,16 -181,11 +189,16 @@@ vector *debReleaseInde Indexes = new vector ; for (vector::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) + I != SectionEntries.end(); I++) { if ((*I)->IsSrc) Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); else + { Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); + Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section)); + } + } + return Indexes; } diff --combined debian/changelog index acf74d166,0b4bd00e9..0e85b5117 --- a/debian/changelog +++ b/debian/changelog @@@ -1,17 -1,36 +1,36 @@@ - apt (0.6.41.1) unstable; urgency=low + apt (0.6.42) unstable; urgency=low * apt-pkg/cdrom.cc: - unmount the cdrom when apt failed to locate any package files * allow cdrom failures and fallback to other sources in that case (closes: #44135) * better error text when dpkg-source fails - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104: + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - * applied frensh man-page update (thanks to Philippe Batailler) + - patch-109: Italian translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed (Closes: #333299) + * applied french man-page update (thanks to Philippe Batailler) + (closes: #316638, #327456) + * fix leak in the mmap code, thanks to Daniel Burrows for the + patch (closes: #250583) + * support for apt-get [build-dep|source] -t (closes: #152129) + * added "APT::Authentication::Trust-CDROM" option to make the life + for the installer people easier (closes: #334656) + * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) + (closes: #334671) + * apt-pkg/contrib/md5.cc: + - fix a alignment problem on sparc64 that gives random bus errors + (thanks to Fabbione for providing a test-case) + * init the default ScreenWidth to 79 columns by default + (Closes: #324921) + * cmdline/apt-cdrom.cc: + - fix some missing gettext() calls (closes: #334539) + * doc/apt-cache.8.xml: fix typo (closes: #334714) - -- + -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 apt (0.6.41) unstable; urgency=low @@@ -95,7 -114,6 +114,7 @@@ apt (0.6.38) unstable; urgency=lo -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +>>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81