From: Michael Vogt Date: Thu, 20 Oct 2005 09:44:54 +0000 (+0000) Subject: * merged with main X-Git-Tag: 0.7.21~284^2~44 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d64805b9d9bb6df1ca22aff8ad040b5288c996eb?hp=-c * merged with main Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77 * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu --- d64805b9d9bb6df1ca22aff8ad040b5288c996eb diff --combined apt-pkg/deb/debmetaindex.cc index ea53a847e,85e5b16b3..d3b6ed957 --- 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,7 -165,7 +173,7 @@@ bool debReleaseIndex::IsTrusted() cons string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; - if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(_config->FindB("APT::Authentication::TrustCDROM", false)) if(URI.substr(0,strlen("cdrom:")) == "cdrom:") return true; @@@ -189,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 ff400a6ab,6b858cdcd..2b100e040 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,3 +1,13 @@@ +apt (0.6.42.0exp1) experimental; urgency=low + + * added support for package index diffs + * added support for i18n of the package descriptions ++ * synced with the apt--debian-sid--0 branch + * build from mvo@debian.org--2005/apt--debian-experimental--0 + (from http://people.debian.org/~mvo/arch) + + -- Michael Vogt Wed, 19 Oct 2005 22:12:13 +0200 + apt (0.6.42) unstable; urgency=low * apt-pkg/cdrom.cc: @@@ -26,7 -17,7 +27,7 @@@ * 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 + * added "APT::Authentication::TrustCDROM" 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) @@@ -38,7 -29,7 +39,7 @@@ * 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 @@@ -123,7 -114,6 +124,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