From: Michael Vogt Date: Wed, 19 Oct 2005 14:51:43 +0000 (+0000) Subject: * merged with apt--mvo X-Git-Tag: 0.7.21~284^2~46 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f7132d28980564b0dd75aff1e27f4b02407fa5cc?hp=-c * merged with apt--mvo Patches applied: * 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--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 --- f7132d28980564b0dd75aff1e27f4b02407fa5cc 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 configure.in index 805056e91,87dac8e47..9816858a8 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.41.0exp1") -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.41.0exp2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/changelog index ba00a87e5,078d2c8b2..605e56eab --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,4 +1,17 @@@ -apt (0.6.41.1) unstable; urgency=low ++apt (0.6.41.0exp2) experimental; urgency=low ++ ++ * support for apt-get source -t (and honor pining) (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) ++ ++ -- Michael Vogt Wed, 19 Oct 2005 16:19:49 +0200 ++ +apt (0.6.41.0exp1) experimental; urgency=low * apt-pkg/cdrom.cc: - unmount the cdrom when apt failed to locate any package files @@@ -10,18 -10,22 +23,18 @@@ - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - patch-109: Italian translation completed - - patch-112: Swedish translation update - - patch-115: Basque translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316318, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) - * support for apt-get source -t (and honor pining) (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) + * added support for package index diffs + * added support for i18n of the package descriptions + * build from mvo@debian.org--2005/apt--debian-experimental--0 + (from http://people.debian.org/~mvo/arch) - -- + -- Michael Vogt Mon, 17 Oct 2005 17:16:45 +0200 apt (0.6.41) unstable; urgency=low @@@ -105,7 -109,6 +118,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