diff options
64 files changed, 5338 insertions, 1933 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index f231c42b4..9ea1519f1 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1620,6 +1620,13 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /* { if (AuthPass == false) { + // Remove the 'old' InRelease file if we try Release.gpg now as otherwise + // the file will stay around and gives a false-auth impression (CVE-2012-0214) + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile.append(URItoFileName(RealURI)); + if (FileExists(FinalFile)) + unlink(FinalFile.c_str()); + new pkgAcqMetaSig(Owner, MetaSigURI, MetaSigURIDesc, MetaSigShortDesc, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, @@ -1825,7 +1832,18 @@ bool pkgAcqArchive::QueueNext() else PartialSize = Buf.st_size; } - + + // Disables download of archives - useful if no real installation follows, + // e.g. if we are just interested in proposed installation order + if (_config->FindB("Debug::pkgAcqArchive::NoQueue", false) == true) + { + Complete = true; + Local = true; + Status = StatDone; + StoreFilename = DestFile = FinalFile; + return true; + } + // Create the item Local = false; Desc.URI = Index->ArchiveURI(PkgFile); diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index cdc3fba4b..573a85c2f 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -766,7 +766,7 @@ void pkgAcquire::Queue::Bump() // AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgAcquireStatus::pkgAcquireStatus() : Update(true), MorePulses(false) +pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Update(true), MorePulses(false) { Start(); } diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f7a333606..ed3534f0d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -471,11 +471,11 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) // ProblemResolver::pkgProblemResolver - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgProblemResolver::pkgProblemResolver(pkgDepCache *pCache) : Cache(*pCache) +pkgProblemResolver::pkgProblemResolver(pkgDepCache *pCache) : d(NULL), Cache(*pCache) { // Allocate memory unsigned long Size = Cache.Head().PackageCount; - Scores = new signed short[Size]; + Scores = new int[Size]; Flags = new unsigned char[Size]; memset(Flags,0,sizeof(*Flags)*Size); @@ -515,20 +515,20 @@ void pkgProblemResolver::MakeScores() memset(Scores,0,sizeof(*Scores)*Size); // Important Required Standard Optional Extra - signed short PrioMap[] = { + int PrioMap[] = { 0, - (signed short) _config->FindI("pkgProblemResolver::Scores::Important",3), - (signed short) _config->FindI("pkgProblemResolver::Scores::Required",2), - (signed short) _config->FindI("pkgProblemResolver::Scores::Standard",1), - (signed short) _config->FindI("pkgProblemResolver::Scores::Optional",-1), - (signed short) _config->FindI("pkgProblemResolver::Scores::Extra",-2) + _config->FindI("pkgProblemResolver::Scores::Important",3), + _config->FindI("pkgProblemResolver::Scores::Required",2), + _config->FindI("pkgProblemResolver::Scores::Standard",1), + _config->FindI("pkgProblemResolver::Scores::Optional",-1), + _config->FindI("pkgProblemResolver::Scores::Extra",-2) }; - signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); - signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); - signed short PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1); - signed short PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1); - signed short AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000); - signed short AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000); + int PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); + int PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); + int PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1); + int PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1); + int AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000); + int AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000); if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true) clog << "Settings used to calculate pkgProblemResolver::Scores::" << endl @@ -550,7 +550,7 @@ void pkgProblemResolver::MakeScores() if (Cache[I].InstallVer == 0) continue; - signed short &Score = Scores[I->ID]; + int &Score = Scores[I->ID]; /* This is arbitrary, it should be high enough to elevate an essantial package above most other packages but low enough @@ -588,7 +588,7 @@ void pkgProblemResolver::MakeScores() } // Copy the scores to advoid additive looping - SPtrArray<signed short> OldScores = new signed short[Size]; + SPtrArray<int> OldScores = new int[Size]; memcpy(OldScores,Scores,sizeof(*Scores)*Size); /* Now we cause 1 level of dependency inheritance, that is we add the @@ -1098,8 +1098,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) LEnd->Dep = End; LEnd++; - if (Start->Type != pkgCache::Dep::Conflicts && - Start->Type != pkgCache::Dep::Obsoletes) + if (Start.IsNegative() == false) break; } } diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 185d11e96..37eacf1f8 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -96,7 +96,7 @@ class pkgProblemResolver /*{{{*/ enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1), Upgradable = (1 << 2), ReInstateTried = (1 << 3), ToRemove = (1 << 4)}; - signed short *Scores; + int *Scores; unsigned char *Flags; bool Debug; diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index c7da4cf35..b5ad74831 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -20,6 +20,7 @@ #include <sys/types.h> #include <dirent.h> #include <stdio.h> +#include <fcntl.h> #include <algorithm> #include <string> @@ -328,13 +329,60 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache // FIXME: It is a bit unclean to have debian specific code here… if (archs.empty() == true) { archs.push_back(arch); - string dpkgcall = _config->Find("Dir::Bin::dpkg", "dpkg"); - std::vector<string> const dpkgoptions = _config->FindVector("DPkg::options"); - for (std::vector<string>::const_iterator o = dpkgoptions.begin(); - o != dpkgoptions.end(); ++o) - dpkgcall.append(" ").append(*o); - dpkgcall.append(" --print-foreign-architectures 2> /dev/null"); - FILE *dpkg = popen(dpkgcall.c_str(), "r"); + + // Generate the base argument list for dpkg + std::vector<const char *> Args; + string Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); + { + string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/"); + size_t dpkgChrootLen = dpkgChrootDir.length(); + if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0) { + if (dpkgChrootDir[dpkgChrootLen - 1] == '/') + --dpkgChrootLen; + Tmp = Tmp.substr(dpkgChrootLen); + } + } + Args.push_back(Tmp.c_str()); + + // Stick in any custom dpkg options + ::Configuration::Item const *Opts = _config->Tree("DPkg::Options"); + if (Opts != 0) { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args.push_back(Opts->Value.c_str()); + } + } + + Args.push_back("--print-foreign-architectures"); + Args.push_back(NULL); + + int external[2] = {-1, -1}; + if (pipe(external) != 0) + { + _error->WarningE("getArchitecture", "Can't create IPC pipe for dpkg --print-foreign-architectures"); + return archs; + } + + pid_t dpkgMultiArch = ExecFork(); + if (dpkgMultiArch == 0) { + close(external[0]); + std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory"); + if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0) + _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str()); + int const nullfd = open("/dev/null", O_RDONLY); + dup2(nullfd, STDIN_FILENO); + dup2(external[1], STDOUT_FILENO); + dup2(nullfd, STDERR_FILENO); + execv(Args[0], (char**) &Args[0]); + _error->WarningE("getArchitecture", "Can't detect foreign architectures supported by dpkg!"); + _exit(100); + } + close(external[1]); + + FILE *dpkg = fdopen(external[0], "r"); char buf[1024]; if(dpkg != NULL) { while (fgets(buf, sizeof(buf), dpkg) != NULL) { @@ -349,8 +397,9 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache arch = strtok(NULL, " "); } } - pclose(dpkg); + fclose(dpkg); } + ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true); return archs; } diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 1b8d91a44..dfbd8b1d8 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -30,7 +30,7 @@ // CacheFile::CacheFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL), +pkgCacheFile::pkgCacheFile() : d(NULL), Map(NULL), Cache(NULL), DCache(NULL), SrcList(NULL), Policy(NULL) { } diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 210a9a9ab..9ec3fa699 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -18,7 +18,7 @@ /*}}}*/ namespace APT { namespace CacheFilter { -PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) {/*{{{*/ +PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) : d(NULL) {/*{{{*/ pattern = new regex_t; int const Res = regcomp(pattern, Pattern.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); if (Res == 0) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 0949ec223..36866a35a 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -185,8 +185,14 @@ string Configuration::FindFile(const char *Name,const char *Default) const } string val = Itm->Value; - while (Itm->Parent != 0 && Itm->Parent->Value.empty() == false) - { + while (Itm->Parent != 0) + { + if (Itm->Parent->Value.empty() == true) + { + Itm = Itm->Parent; + continue; + } + // Absolute if (val.length() >= 1 && val[0] == '/') break; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 28898fc34..529e7d655 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -890,6 +890,11 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); std::string name; + + // compat with the old API + if (Mode == ReadOnlyGzip && Compress == None) + Compress = Gzip; + switch (Compress) { case None: name = "."; break; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2b04f0e71..eb43cbfb8 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -29,7 +29,6 @@ #include <sys/wait.h> #include <signal.h> #include <errno.h> -#include <string.h> #include <stdio.h> #include <string.h> #include <algorithm> @@ -51,8 +50,10 @@ using namespace std; class pkgDPkgPMPrivate { public: - pkgDPkgPMPrivate() : dpkgbuf_pos(0), term_out(NULL), history_out(NULL) + pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0), + term_out(NULL), history_out(NULL) { + dpkgbuf[0] = '\0'; } bool stdin_is_dev_null; // the buffer we use for the dpkg status-fd reading @@ -123,6 +124,45 @@ ionice(int PID) return ExecWait(Process, "ionice"); } +// dpkgChrootDirectory - chrooting for dpkg if needed /*{{{*/ +static void dpkgChrootDirectory() +{ + std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory"); + if (chrootDir == "/") + return; + std::cerr << "Chrooting into " << chrootDir << std::endl; + if (chroot(chrootDir.c_str()) != 0) + _exit(100); +} + /*}}}*/ + + +// FindNowVersion - Helper to find a Version in "now" state /*{{{*/ +// --------------------------------------------------------------------- +/* This is helpful when a package is no longer installed but has residual + * config files + */ +static +pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg) +{ + pkgCache::VerIterator Ver; + for (Ver = Pkg.VersionList(); Ver.end() == false; Ver++) + { + pkgCache::VerFileIterator Vf = Ver.FileList(); + pkgCache::PkgFileIterator F = Vf.File(); + for (F = Vf.File(); F.end() == false; F++) + { + if (F && F.Archive()) + { + if (strcmp(F.Archive(), "now")) + return Ver; + } + } + } + return Ver; +} + /*}}}*/ + // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -328,15 +368,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) SetCloseExec(STDIN_FILENO,false); SetCloseExec(STDERR_FILENO,false); - if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") - { - std::cerr << "Chrooting into " - << _config->FindDir("DPkg::Chroot-Directory") - << std::endl; - if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0) - _exit(100); - } - + dpkgChrootDirectory(); const char *Args[4]; Args[0] = "/bin/sh"; Args[1] = "-c"; @@ -832,7 +864,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) // Generate the base argument list for dpkg std::vector<const char *> Args; unsigned long StartSize = 0; - string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); + string Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); + { + string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/"); + size_t dpkgChrootLen = dpkgChrootDir.length(); + if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0) + { + if (dpkgChrootDir[dpkgChrootLen - 1] == '/') + --dpkgChrootLen; + Tmp = Tmp.substr(dpkgChrootLen); + } + } Args.push_back(Tmp.c_str()); StartSize += Tmp.length(); @@ -858,6 +900,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) pid_t dpkgAssertMultiArch = ExecFork(); if (dpkgAssertMultiArch == 0) { + dpkgChrootDirectory(); // redirect everything to the ultimate sink as we only need the exit-status int const nullfd = open("/dev/null", O_RDONLY); dup2(nullfd, STDIN_FILENO); @@ -1092,11 +1135,18 @@ bool pkgDPkgPM::Go(int OutStatusFd) { pkgCache::VerIterator PkgVer; std::string name = I->Pkg.Name(); - if (Op == Item::Remove || Op == Item::Purge) + if (Op == Item::Remove || Op == Item::Purge) + { PkgVer = I->Pkg.CurrentVer(); + if(PkgVer.end() == true) + PkgVer = FindNowVersion(I->Pkg); + } else PkgVer = Cache[I->Pkg].InstVerIter(Cache); - name.append(":").append(PkgVer.Arch()); + if (PkgVer.end() == false) + name.append(":").append(PkgVer.Arch()); + else + _error->Warning("Can not find PkgVer for '%s'", name.c_str()); char * const fullname = strdup(name.c_str()); Packages.push_back(fullname); ADDARG(fullname); @@ -1202,14 +1252,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) } close(fd[0]); // close the read end of the pipe - if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") - { - std::cerr << "Chrooting into " - << _config->FindDir("DPkg::Chroot-Directory") - << std::endl; - if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0) - _exit(100); - } + dpkgChrootDirectory(); if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -1408,7 +1451,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) string::size_type pos; FILE *report; - if (_config->FindB("Dpkg::ApportFailureReport", false) == false) + if (_config->FindB("Dpkg::ApportFailureReport", true) == false) { std::clog << "configured to not write apport reports" << std::endl; return; @@ -1435,18 +1478,49 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) } // do not report out-of-memory failures - if(strstr(errormsg, strerror(ENOMEM)) != NULL) { + if(strstr(errormsg, strerror(ENOMEM)) != NULL || + strstr(errormsg, "failed to allocate memory") != NULL) { std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl; return; } - // do not report dpkg I/O errors - // XXX - this message is localized, but this only matches the English version. This is better than nothing. - if(strstr(errormsg, "short read in buffer_copy (")) { - std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + // do not report bugs regarding inaccessible local files + if(strstr(errormsg, strerror(ENOENT)) != NULL || + strstr(errormsg, "cannot access archive") != NULL) { + std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl; + return; + } + + // do not report errors encountered when decompressing packages + if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) { + std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl; return; } + // do not report dpkg I/O errors, this is a format string, so we compare + // the prefix and the suffix of the error with the dpkg error message + vector<string> io_errors; + io_errors.push_back(string("failed to read on buffer copy for %s")); + io_errors.push_back(string("failed in write on buffer copy for %s")); + io_errors.push_back(string("short read on buffer copy for %s")); + + for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++) + { + vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%'); + if (list.size() > 1) { + // we need to split %s, VectorizeString only allows char so we need + // to kill the "s" manually + if (list[1].size() > 1) { + list[1].erase(0, 1); + if(strstr(errormsg, list[0].c_str()) && + strstr(errormsg, list[1].c_str())) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } + } + } + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); @@ -1536,6 +1610,24 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) { while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); + fprintf(report, " \n"); + fclose(log); + } + } + + // attach history log it if we have it + string histfile_name = _config->FindFile("Dir::Log::History"); + if (!histfile_name.empty()) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "DpkgHistoryLog:\n"); + log = fopen(histfile_name.c_str(),"r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); fclose(log); } } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 085159711..fdfd1c713 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -871,6 +871,7 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, if (FromUser == false && Pkg->CurrentVer == 0) { StateCache &P = PkgState[Pkg->ID]; + // Status == 2 means this applies for new installs only if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto) { if (DebugMarker == true) @@ -1240,19 +1241,36 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) if (unlikely(Pkg.end() == true)) return; + APT::PackageList pkglist; + if (Pkg->CurrentVer != 0 && + (Pkg.CurrentVer()-> MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + { + pkgCache::GrpIterator Grp = Pkg.Group(); + for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + { + if (P->CurrentVer != 0) + pkglist.insert(P); + } + } + else + pkglist.insert(Pkg); + ActionGroup group(*this); - RemoveSizes(Pkg); - RemoveStates(Pkg); - - StateCache &P = PkgState[Pkg->ID]; - if (To == true) - P.iFlags |= ReInstall; - else - P.iFlags &= ~ReInstall; - - AddStates(Pkg); - AddSizes(Pkg); + for (APT::PackageList::const_iterator Pkg = pkglist.begin(); Pkg != pkglist.end(); ++Pkg) + { + RemoveSizes(Pkg); + RemoveStates(Pkg); + + StateCache &P = PkgState[Pkg->ID]; + if (To == true) + P.iFlags |= ReInstall; + else + P.iFlags &= ~ReInstall; + + AddStates(Pkg); + AddSizes(Pkg); + } } /*}}}*/ // DepCache::SetCandidateVersion - Change the candidate version /*{{{*/ diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 3747e3570..e29e2819c 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -85,7 +85,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, string OrigPath = string(*I,CDROM.length()); // Open the package file - FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Extension); + FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Auto); off_t const FileSize = Pkg.Size(); pkgTagFile Parser(&Pkg); @@ -797,7 +797,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ string OrigPath = string(*I,CDROM.length()); // Open the package file - FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Extension); + FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto); off_t const FileSize = Pkg.Size(); pkgTagFile Parser(&Pkg); diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index a1c47c030..4c15858a1 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -92,6 +92,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 0ac9a83e3..3a179b2a2 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -82,16 +82,14 @@ pkgOrderList *pkgOrderList::Me = 0; // OrderList::pkgOrderList - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgOrderList::pkgOrderList(pkgDepCache *pCache) : Cache(*pCache) +pkgOrderList::pkgOrderList(pkgDepCache *pCache) : Cache(*pCache), + Primary(NULL), Secondary(NULL), + RevDepends(NULL), Remove(NULL), + AfterEnd(NULL), FileList(NULL), + LoopCount(-1), Depth(0) { - FileList = 0; - Primary = 0; - Secondary = 0; - RevDepends = 0; - Remove = 0; - LoopCount = -1; Debug = _config->FindB("Debug::pkgOrderList",false); - + /* Construct the arrays, egcs 1.0.1 bug requires the package count hack */ unsigned long Size = Cache.Head().PackageCount; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a370f15a3..14a227e3e 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -36,11 +36,13 @@ bool pkgPackageManager::SigINTStop = false; // PM::PackageManager - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache) +pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache), + List(NULL), Res(Incomplete) { FileNames = new string[Cache.Head().PackageCount]; - List = 0; Debug = _config->FindB("Debug::pkgPackageManager",false); + NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); + ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false); } /*}}}*/ // PM::PackageManager - Destructor /*{{{*/ @@ -150,7 +152,7 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate)) { if(Debug) - clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl; + clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.FullName() << endl; List->Flag(D.TargetPkg(),pkgOrderList::Immediate); ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1); } @@ -169,10 +171,7 @@ bool pkgPackageManager::CreateOrderList() delete List; List = new pkgOrderList(&Cache); - - NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); - ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false); - + if (Debug && ImmConfigureAll) clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl; @@ -189,7 +188,7 @@ bool pkgPackageManager::CreateOrderList() NoImmConfigure == false) || ImmConfigureAll) { if(Debug && !ImmConfigureAll) - clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl; + clog << "CreateOrderList(): Adding Immediate flag for " << I.FullName() << endl; List->Flag(I,pkgOrderList::Immediate); if (!ImmConfigureAll) { @@ -258,7 +257,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, if (EarlyRemove(D.ParentPkg()) == false) return _error->Error("Reverse conflicts early remove for package '%s' failed", - Pkg.Name()); + Pkg.FullName().c_str()); } return true; } @@ -296,9 +295,9 @@ bool pkgPackageManager::ConfigureAll() if (ConfigurePkgs == true && SmartConfigure(Pkg, 0) == false) { if (ImmConfigureAll) _error->Error(_("Could not perform immediate configuration on '%s'. " - "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1); + "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),1); else - _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name()); + _error->Error("Internal error, packages left unconfigured. %s",Pkg.FullName().c_str()); return false; } @@ -323,11 +322,11 @@ bool pkgPackageManager::ConfigureAll() bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) { // If this is true, only check and correct and dependencies without the Loop flag - bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop); + bool const PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop); if (Debug) { VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); - clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.Name() << " (" << InstallVer.VerStr() << ")"; + clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.FullName() << " (" << InstallVer.VerStr() << ")"; if (PkgLoop) clog << " (Only Correct Dependencies)"; clog << endl; @@ -338,103 +337,135 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) /* Because of the ordered list, most dependencies should be unpacked, however if there is a loop (A depends on B, B depends on A) this will not be the case, so check for dependencies before configuring. */ - bool Bad = false; - for (DepIterator D = instVer.DependsList(); - D.end() == false; ) - { - // Compute a single dependency element (glob or) - pkgCache::DepIterator Start; - pkgCache::DepIterator End; - D.GlobOr(Start,End); - - if (End->Type == pkgCache::Dep::Depends) - Bad = true; - - // Check for dependanices that have not been unpacked, probably due to loops. - while (End->Type == pkgCache::Dep::Depends) { - PkgIterator DepPkg; - VerIterator InstallVer; - SPtrArray<Version *> VList = Start.AllTargets(); - - // Check through each version of each package that could satisfy this dependancy - for (Version **I = VList; *I != 0; I++) { - VerIterator Ver(Cache,*I); - DepPkg = Ver.ParentPkg(); - InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer); - - // Check if the current version of the package is avalible and will satisfy this dependancy - if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && - !List->IsFlag(DepPkg,pkgOrderList::Removed) && DepPkg.State() == PkgIterator::NeedsNothing) + bool Bad = false, Changed = false; + do { + Changed = false; + for (DepIterator D = instVer.DependsList(); D.end() == false; ) + { + // Compute a single dependency element (glob or) + pkgCache::DepIterator Start, End; + D.GlobOr(Start,End); + + if (End->Type != pkgCache::Dep::Depends) + continue; + Bad = true; + + // Search for dependencies which are unpacked but aren't configured yet (maybe loops) + for (DepIterator Cur = Start; true; ++Cur) + { + SPtrArray<Version *> VList = Cur.AllTargets(); + + for (Version **I = VList; *I != 0; ++I) { - Bad = false; - break; - } - - // Check if the version that is going to be installed will satisfy the dependancy - if (Cache[DepPkg].InstallVer == *I) { - if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) { - if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) { - // This dependancy has already been dealt with by another SmartConfigure on Pkg - Bad = false; - break; - } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) { - /* Check for a loop to prevent one forming - If A depends on B and B depends on A, SmartConfigure will - just hop between them if this is not checked. Dont remove the - loop flag after finishing however as loop is already set. - This means that there is another SmartConfigure call for this - package and it will remove the loop flag */ - Bad = !SmartConfigure(DepPkg, Depth + 1); - } else { - /* Check for a loop to prevent one forming - If A depends on B and B depends on A, SmartConfigure will - just hop between them if this is not checked */ - List->Flag(Pkg,pkgOrderList::Loop); - Bad = !SmartConfigure(DepPkg, Depth + 1); - List->RmFlag(Pkg,pkgOrderList::Loop); - } - // If SmartConfigure was succesfull, Bad is false, so break - if (!Bad) break; - } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) { - Bad = false; - break; + VerIterator Ver(Cache,*I); + PkgIterator DepPkg = Ver.ParentPkg(); + + // Check if the current version of the package is available and will satisfy this dependency + if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && + List->IsFlag(DepPkg,pkgOrderList::Removed) == false && + DepPkg.State() == PkgIterator::NeedsNothing) + { + Bad = false; + break; + } + + // Check if the version that is going to be installed will satisfy the dependency + if (Cache[DepPkg].InstallVer != *I) + continue; + + if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) + { + if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) + { + // This dependency has already been dealt with by another SmartConfigure on Pkg + Bad = false; + break; + } + /* Check for a loop to prevent one forming + If A depends on B and B depends on A, SmartConfigure will + just hop between them if this is not checked. Dont remove the + loop flag after finishing however as loop is already set. + This means that there is another SmartConfigure call for this + package and it will remove the loop flag */ + if (PkgLoop == false) + List->Flag(Pkg,pkgOrderList::Loop); + if (SmartConfigure(DepPkg, Depth + 1) == true) + { + Bad = false; + if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) + Changed = true; + } + if (PkgLoop == false) + List->RmFlag(Pkg,pkgOrderList::Loop); + // If SmartConfigure was succesfull, Bad is false, so break + if (Bad == false) + break; + } + else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) + { + Bad = false; + break; } } - } - - /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */ - if (InstallVer != 0 && Bad) { - if (List->IsNow(DepPkg)) { - Bad = false; - if (List->IsFlag(Pkg,pkgOrderList::Loop)) + if (Cur == End) + break; + } + + if (Bad == false) + continue; + + // Check for dependencies that have not been unpacked, probably due to loops. + for (DepIterator Cur = Start; true; ++Cur) + { + SPtrArray<Version *> VList = Cur.AllTargets(); + + for (Version **I = VList; *I != 0; ++I) + { + VerIterator Ver(Cache,*I); + PkgIterator DepPkg = Ver.ParentPkg(); + + // Check if the version that is going to be installed will satisfy the dependency + if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false) + continue; + + if (PkgLoop == true) { if (Debug) std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; + Bad = false; + break; } else { - List->Flag(Pkg,pkgOrderList::Loop); if (Debug) - cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl; - SmartUnPack(DepPkg, true, Depth + 1); - List->RmFlag(Pkg,pkgOrderList::Loop); + clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; + if (PkgLoop == false) + List->Flag(Pkg,pkgOrderList::Loop); + if (SmartUnPack(DepPkg, true, Depth + 1) == true) + { + Bad = false; + if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) + Changed = true; + } + if (PkgLoop == false) + List->RmFlag(Pkg,pkgOrderList::Loop); + if (Bad == false) + break; } } + + if (Cur == End) + break; } - - if (Start==End) { - if (Bad && Debug && List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - std::clog << OutputInDepth(Depth) << "Could not satisfy dependencies for " << Pkg.Name() << std::endl; - break; - } else { - Start++; - } + + if (Bad == true && Changed == false && Debug == true) + std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl; } - } + } while (Changed == true); if (Bad) { if (Debug) - _error->Warning(_("Could not configure '%s'. "),Pkg.Name()); + _error->Warning(_("Could not configure '%s'. "),Pkg.FullName().c_str()); return false; } @@ -444,7 +475,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) static bool const ConfigurePkgs = (conf == "all" || conf == "smart"); if (List->IsFlag(Pkg,pkgOrderList::Configured)) - return _error->Error("Internal configure error on '%s'.", Pkg.Name()); + return _error->Error("Internal configure error on '%s'.", Pkg.FullName().c_str()); if (ConfigurePkgs == true && Configure(Pkg) == false) return false; @@ -464,7 +495,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) // Sanity Check if (List->IsFlag(Pkg,pkgOrderList::Configured) == false) - return _error->Error(_("Could not configure '%s'. "),Pkg.Name()); + return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str()); return true; } @@ -508,7 +539,7 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg) "removing the essential package %s due to a " "Conflicts/Pre-Depends loop. This is often bad, " "but if you really want to do it, activate the " - "APT::Force-LoopBreak option."),Pkg.Name()); + "APT::Force-LoopBreak option."),Pkg.FullName().c_str()); } bool Res = SmartRemove(Pkg); @@ -544,184 +575,252 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop); if (Debug) { - clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.Name(); + clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName(); VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); if (Pkg.CurrentVer() == 0) - cout << " (install version " << InstallVer.VerStr() << ")"; + clog << " (install version " << InstallVer.VerStr() << ")"; else - cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")"; + clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")"; if (PkgLoop) - cout << " (Only Perform PreUnpack Checks)"; - cout << endl; + clog << " (Only Perform PreUnpack Checks)"; + clog << endl; } VerIterator const instVer = Cache[Pkg].InstVerIter(Cache); /* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked. - It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should + It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with - complex dependancy structures, trying to configure some packages while breaking the loops can complicate things . - This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), + complex dependancy structures, trying to configure some packages while breaking the loops can complicate things . + This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */ - for (DepIterator D = instVer.DependsList(); - D.end() == false; ) - { - // Compute a single dependency element (glob or) - pkgCache::DepIterator Start; - pkgCache::DepIterator End; - D.GlobOr(Start,End); - - while (End->Type == pkgCache::Dep::PreDepends) + bool Changed = false; + do { + Changed = false; + for (DepIterator D = instVer.DependsList(); D.end() == false; ) { - if (Debug) - clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.Name() << std::endl; + // Compute a single dependency element (glob or) + pkgCache::DepIterator Start, End; + D.GlobOr(Start,End); - // Look for possible ok targets. - SPtrArray<Version *> VList = Start.AllTargets(); - bool Bad = true; - for (Version **I = VList; *I != 0 && Bad == true; I++) - { - VerIterator Ver(Cache,*I); - PkgIterator Pkg = Ver.ParentPkg(); - - // See if the current version is ok - if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && - Pkg.State() == PkgIterator::NeedsNothing) + if (End->Type == pkgCache::Dep::PreDepends) + { + bool Bad = true; + if (Debug) + clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.FullName() << std::endl; + + // Look for easy targets: packages that are already okay + for (DepIterator Cur = Start; Bad == true; ++Cur) { - Bad = false; - if (Debug) - clog << OutputInDepth(Depth) << "Found ok package " << Pkg.Name() << endl; - continue; - } - } - - // Look for something that could be configured. - for (Version **I = VList; *I != 0 && Bad == true; I++) - { - VerIterator Ver(Cache,*I); - PkgIterator Pkg = Ver.ParentPkg(); - - // Not the install version - if (Cache[Pkg].InstallVer != *I || - (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)) - continue; - - if (List->IsFlag(Pkg,pkgOrderList::Configured)) { - Bad = false; - continue; + SPtrArray<Version *> VList = Start.AllTargets(); + for (Version **I = VList; *I != 0; ++I) + { + VerIterator Ver(Cache,*I); + PkgIterator Pkg = Ver.ParentPkg(); + + // See if the current version is ok + if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && + Pkg.State() == PkgIterator::NeedsNothing) + { + Bad = false; + if (Debug) + clog << OutputInDepth(Depth) << "Found ok package " << Pkg.FullName() << endl; + break; + } + } + if (Cur == End) + break; } - if (Debug) - clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.Name() << endl; - Bad = !SmartConfigure(Pkg, Depth + 1); - } + // Look for something that could be configured. + for (DepIterator Cur = Start; Bad == true; ++Cur) + { + SPtrArray<Version *> VList = Start.AllTargets(); + for (Version **I = VList; *I != 0; ++I) + { + VerIterator Ver(Cache,*I); + PkgIterator Pkg = Ver.ParentPkg(); + + // Not the install version + if (Cache[Pkg].InstallVer != *I || + (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)) + continue; + + if (List->IsFlag(Pkg,pkgOrderList::Configured)) + { + Bad = false; + break; + } + + // check if it needs unpack or if if configure is enough + if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false) + { + if (Debug) + clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << Pkg.FullName() << endl; + // SmartUnpack with the ImmediateFlag to ensure its really ready + if (SmartUnPack(Pkg, true, Depth + 1) == true) + { + Bad = false; + if (List->IsFlag(Pkg,pkgOrderList::Loop) == false) + Changed = true; + break; + } + } + else + { + if (Debug) + clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.FullName() << endl; + if (SmartConfigure(Pkg, Depth + 1) == true) + { + Bad = false; + if (List->IsFlag(Pkg,pkgOrderList::Loop) == false) + Changed = true; + break; + } + } + } + } - /* If this or element did not match then continue on to the - next or element until a matching element is found */ - if (Bad == true) - { - // This triggers if someone make a pre-depends/depend loop. - if (Start == End) - return _error->Error("Couldn't configure pre-depend %s for %s, " - "probably a dependency cycle.", - End.TargetPkg().Name(),Pkg.Name()); - ++Start; + if (Bad == true) + { + if (Start == End) + return _error->Error("Couldn't configure pre-depend %s for %s, " + "probably a dependency cycle.", + End.TargetPkg().FullName().c_str(),Pkg.FullName().c_str()); + } + else + continue; } - else - break; - } - - if (End->Type == pkgCache::Dep::Conflicts || - End->Type == pkgCache::Dep::Obsoletes) - { - /* Look for conflicts. Two packages that are both in the install - state cannot conflict so we don't check.. */ - SPtrArray<Version *> VList = End.AllTargets(); - for (Version **I = VList; *I != 0; I++) + else if (End->Type == pkgCache::Dep::Conflicts || + End->Type == pkgCache::Dep::Obsoletes) { - VerIterator Ver(Cache,*I); - PkgIterator ConflictPkg = Ver.ParentPkg(); - VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer); - - // See if the current version is conflicting - if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg)) - { - cout << OutputInDepth(Depth) << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl; - /* If a loop is not present or has not yet been detected, attempt to unpack packages - to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */ - if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) { - if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) { - if (Debug) - cout << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl; - List->Flag(Pkg,pkgOrderList::Loop); - SmartUnPack(ConflictPkg,false, Depth + 1); - // Remove loop to allow it to be used later if needed - List->RmFlag(Pkg,pkgOrderList::Loop); - } else { - if (EarlyRemove(ConflictPkg) == false) - return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name()); - } - } else { - if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) { - if (Debug) - cout << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl; - if (EarlyRemove(ConflictPkg) == false) - return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name()); - } + /* Look for conflicts. Two packages that are both in the install + state cannot conflict so we don't check.. */ + SPtrArray<Version *> VList = End.AllTargets(); + for (Version **I = VList; *I != 0; I++) + { + VerIterator Ver(Cache,*I); + PkgIterator ConflictPkg = Ver.ParentPkg(); + VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer); + + // See if the current version is conflicting + if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg)) + { + clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl; + /* If a loop is not present or has not yet been detected, attempt to unpack packages + to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */ + if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false) + { + if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) + { + if (Debug) + clog << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to prevent conflict" << endl; + List->Flag(Pkg,pkgOrderList::Loop); + if (SmartUnPack(ConflictPkg,false, Depth + 1) == true) + if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false) + Changed = true; + // Remove loop to allow it to be used later if needed + List->RmFlag(Pkg,pkgOrderList::Loop); + } + else if (EarlyRemove(ConflictPkg) == false) + return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str()); + } + else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false) + { + if (Debug) + clog << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.FullName() << " to conflict violation" << endl; + if (EarlyRemove(ConflictPkg) == false) + return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); + } } } } - } - - // Check for breaks - if (End->Type == pkgCache::Dep::DpkgBreaks) { - SPtrArray<Version *> VList = End.AllTargets(); - for (Version **I = VList; *I != 0; I++) + else if (End->Type == pkgCache::Dep::DpkgBreaks) { - VerIterator Ver(Cache,*I); - PkgIterator BrokenPkg = Ver.ParentPkg(); - VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer); - if (BrokenPkg.CurrentVer() != Ver) + SPtrArray<Version *> VList = End.AllTargets(); + for (Version **I = VList; *I != 0; ++I) { - if (Debug) - std::clog << OutputInDepth(Depth) << " Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl; - continue; - } + VerIterator Ver(Cache,*I); + PkgIterator BrokenPkg = Ver.ParentPkg(); + if (BrokenPkg.CurrentVer() != Ver) + { + if (Debug) + std::clog << OutputInDepth(Depth) << " Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl; + continue; + } - // Check if it needs to be unpacked - if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && - List->IsNow(BrokenPkg)) { - if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) { - // This dependancy has already been dealt with by another SmartUnPack on Pkg - break; - } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) { - /* Found a break, so unpack the package, but dont remove loop as already set. - This means that there is another SmartUnPack call for this - package and it will remove the loop flag. */ - if (Debug) - cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.Name() << " to avoid break" << endl; - - SmartUnPack(BrokenPkg, false, Depth + 1); - } else { - List->Flag(Pkg,pkgOrderList::Loop); - // Found a break, so unpack the package - if (Debug) - cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.Name() << " to avoid break" << endl; - - SmartUnPack(BrokenPkg, false, Depth + 1); - List->RmFlag(Pkg,pkgOrderList::Loop); - } - } - - // Check if a package needs to be removed - if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured)) { - if (Debug) - cout << OutputInDepth(Depth) << " Removing " << BrokenPkg.Name() << " to avoid break" << endl; - SmartRemove(BrokenPkg); + // Check if it needs to be unpacked + if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && + List->IsNow(BrokenPkg)) + { + if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) + { + // This dependancy has already been dealt with by another SmartUnPack on Pkg + break; + } + else + { + // Found a break, so see if we can unpack the package to avoid it + // but do not set loop if another SmartUnPack already deals with it + // Also, avoid it if the package we would unpack pre-depends on this one + VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer); + bool circle = false; + for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D) + { + if (D->Type != pkgCache::Dep::PreDepends) + continue; + SPtrArray<Version *> VL = D.AllTargets(); + for (Version **I = VL; *I != 0; ++I) + { + VerIterator V(Cache,*I); + PkgIterator P = V.ParentPkg(); + // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers + if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V)) + continue; + circle = true; + break; + } + if (circle == true) + break; + } + if (circle == true) + { + if (Debug) + clog << OutputInDepth(Depth) << " Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl; + continue; + } + else + { + if (Debug) + { + clog << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.FullName() << " to avoid " << End; + if (PkgLoop == true) + clog << " (Looping)"; + clog << std::endl; + } + if (PkgLoop == false) + List->Flag(Pkg,pkgOrderList::Loop); + if (SmartUnPack(BrokenPkg, false, Depth + 1) == true) + { + if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) == false) + Changed = true; + } + if (PkgLoop == false) + List->RmFlag(Pkg,pkgOrderList::Loop); + } + } + } + // Check if a package needs to be removed + else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false) + { + if (Debug) + clog << OutputInDepth(Depth) << " Removing " << BrokenPkg.FullName() << " to avoid " << End << endl; + SmartRemove(BrokenPkg); + } } } } - } + } while (Changed == true); // Check for reverse conflicts. if (CheckRConflicts(Pkg,Pkg.RevDependsList(), @@ -778,7 +877,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c // Perform immedate configuration of the package. if (SmartConfigure(Pkg, Depth + 1) == false) _error->Warning(_("Could not perform immediate configuration on '%s'. " - "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2); + "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); } return true; @@ -818,11 +917,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() { if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) { if (SmartConfigure(Pkg, 0) == false && Debug) - _error->Warning("Internal Error, Could not configure %s",Pkg.Name()); + _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str()); // FIXME: The above warning message might need changing } else { if (Debug == true) - clog << "Skipping already done " << Pkg.Name() << endl; + clog << "Skipping already done " << Pkg.FullName() << endl; } continue; @@ -831,7 +930,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() if (List->IsMissing(Pkg) == true) { if (Debug == true) - clog << "Sequence completed at " << Pkg.Name() << endl; + clog << "Sequence completed at " << Pkg.FullName() << endl; if (DoneSomething == false) { _error->Error("Internal Error, ordering was unable to handle the media swap"); @@ -845,7 +944,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() Pkg.State() == pkgCache::PkgIterator::NeedsNothing && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall) { - _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name()); + _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.FullName().c_str()); return Failed; } @@ -878,7 +977,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() if (List->IsFlag(*I,pkgOrderList::Configured) == false) { _error->Error("Internal error, packages left unconfigured. %s", - PkgIterator(Cache,*I).Name()); + PkgIterator(Cache,*I).FullName().c_str()); return Failed; } } diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index c5b3bebd7..36dab3480 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -22,7 +22,7 @@ // Records::pkgRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This will create the necessary structures to access the status files */ -pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), +pkgRecords::pkgRecords(pkgCache &Cache) : d(NULL), Cache(Cache), Files(Cache.HeaderP->PackageFileCount) { for (pkgCache::PkgFileIterator I = Cache.FileBegin(); diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc index f61c140fa..05ba6e0e6 100644 --- a/apt-pkg/pkgsystem.cc +++ b/apt-pkg/pkgsystem.cc @@ -26,11 +26,11 @@ unsigned long pkgSystem::GlobalListLen = 0; // System::pkgSystem - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Add it to the global list.. */ -pkgSystem::pkgSystem() +pkgSystem::pkgSystem() : Label(NULL), VS(NULL) { assert(GlobalListLen < sizeof(SysList)/sizeof(*SysList)); SysList[GlobalListLen] = this; - GlobalListLen++; + ++GlobalListLen; } /*}}}*/ // System::GetSystem - Get the named system /*{{{*/ diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index f5f458099..0fddfb451 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -33,7 +33,7 @@ unsigned long pkgSourceList::Type::GlobalListLen = 0; // Type::Type - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Link this to the global list of items*/ -pkgSourceList::Type::Type() +pkgSourceList::Type::Type() : Name(NULL), Label(NULL) { ItmList[GlobalListLen] = this; GlobalListLen++; diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 48b643eac..d63d2c422 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -25,7 +25,7 @@ // SrcRecords::pkgSrcRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Open all the source index files */ -pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0) +pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0) { for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I) { diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index ec86173df..79811899a 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -30,7 +30,10 @@ using std::string; class pkgTagFilePrivate { public: - pkgTagFilePrivate(FileFd *pFd, unsigned long long Size) : Fd(*pFd), Size(Size) + pkgTagFilePrivate(FileFd *pFd, unsigned long long Size) : Fd(*pFd), Buffer(NULL), + Start(NULL), End(NULL), + Done(false), iOffset(0), + Size(Size) { } FileFd &Fd; diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc index a9d4fb763..cb2c34c0f 100644 --- a/apt-pkg/version.cc +++ b/apt-pkg/version.cc @@ -23,10 +23,10 @@ unsigned long pkgVersioningSystem::GlobalListLen = 0; // pkgVS::pkgVersioningSystem - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Link to the global list of versioning systems supported */ -pkgVersioningSystem::pkgVersioningSystem() +pkgVersioningSystem::pkgVersioningSystem() : Label(NULL) { VSList[GlobalListLen] = this; - GlobalListLen++; + ++GlobalListLen; } /*}}}*/ // pkgVS::GetVS - Find a VS by name /*{{{*/ diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 1ccb08804..3ac350aca 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -31,8 +31,9 @@ using namespace std; // --------------------------------------------------------------------- /* */ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) : - ScreenWidth(ScreenWidth), Quiet(Quiet) + ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) { + BlankLine[0] = 0; } /*}}}*/ // AcqTextStatus::Start - Downloading has started /*{{{*/ diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index d5c1a3208..dc4c110a1 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -53,8 +53,8 @@ pkgCache *DebFile::Cache = 0; // --------------------------------------------------------------------- /* */ DebFile::DebFile(const char *debfile) - : File(debfile, FileFd::ReadOnly), Control(0), DepOp(0), - PreDepOp(0), Config(0), Template(0), Which(None) + : File(debfile, FileFd::ReadOnly), Size(0), Control(NULL), ControlLen(0), + DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None) { } /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2d0554e21..45405e761 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2456,7 +2456,7 @@ bool DoSource(CommandLine &CmdL) Src.c_str(), vcs.c_str(), uri.c_str()); if(vcs == "Bzr") ioprintf(c1out,_("Please use:\n" - "bzr get %s\n" + "bzr branch %s\n" "to retrieve the latest (possibly unreleased) " "updates to the package.\n"), uri.c_str()); @@ -2827,7 +2827,7 @@ bool DoBuildDep(CommandLine &CmdL) pkgCache::PkgIterator Pkg; // Cross-Building? - if (StripMultiArch == false) + if (StripMultiArch == false && D->Type != pkgSrcRecords::Parser::BuildDependIndep) { size_t const colon = D->Package.find(":"); if (colon != string::npos && @@ -2863,10 +2863,16 @@ bool DoBuildDep(CommandLine &CmdL) if ((BADVER(Ver)) == false) { string forbidden; - if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All); + if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) + { + if (colon == string::npos) + { + Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); + } + } else if (Ver->MultiArch == pkgCache::Version::Same) { - if (colon != string::npos) + if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); else if (strcmp(D->Package.c_str() + colon, ":any") == 0) forbidden = "Multi-Arch: same"; @@ -3148,7 +3154,10 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, return true; // error - return _error->Error("changelog download failed"); + pkgRecords Recs(CacheFile); + pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); + string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg(); + return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str()); } /*}}}*/ // DisplayFileInPager - Display File with pager /*{{{*/ diff --git a/cmdline/apt-key b/cmdline/apt-key index 97d6e0323..c3d9d9aff 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -16,13 +16,13 @@ fi GPG="$GPG_CMD" -MASTER_KEYRING="" -ARCHIVE_KEYRING_URI="" -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +# ubuntu keyrings +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg +TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg requires_root() { if [ "$(id -u)" -ne 0 ]; then @@ -34,7 +34,7 @@ requires_root() { add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 MASTER=$2 - + if [ ! -f "$ADD_KEYRING" ]; then echo "ERROR: '$ADD_KEYRING' not found" return @@ -50,11 +50,25 @@ add_keys_with_verify_against_master_keyring() { # from a key in the $distro-master-keyring add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5` + for add_key in $add_keys; do - ADDED=0 + + # ensure there are no colisions LP: #857472 + for master_key in $master_keys; do + if [ "$add_key" = "$master_key" ]; then + echo >&2 "Keyid collision for '$add_key' detected, operation aborted" + return 1 + fi + done + + # export the add keyring one-by-one + rm -f $TMP_KEYRING + $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key + # check if signed with the master key and only add in this case + ADDED=0 for master_key in $master_keys; do - if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then - $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import + if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then + $GPG --import $TMP_KEYRING ADDED=1 fi done @@ -62,12 +76,14 @@ add_keys_with_verify_against_master_keyring() { echo >&2 "Key '$add_key' not added. It is not signed with a master key" fi done + rm -f $TMP_KEYRING } # update the current archive signing keyring from a network URI # the archive-keyring keys needs to be signed with the master key # (otherwise it does not make sense from a security POV) net_update() { + if [ -z "$ARCHIVE_KEYRING_URI" ]; then echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set" exit 1 @@ -87,7 +103,7 @@ net_update() { if [ -e $keyring ]; then old_mtime=$(stat -c %Y $keyring) fi - (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) + (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi @@ -101,7 +117,7 @@ net_update() { update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-archive-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi requires_root diff --git a/debian/apt.conf.changelog b/debian/apt.conf.changelog new file mode 100644 index 000000000..c4092ff44 --- /dev/null +++ b/debian/apt.conf.changelog @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 6f6dc92a4..4507c6858 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -434,6 +434,13 @@ fi UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then + # check for a new archive signing key (against the master keyring) + if eval apt-key net-update $XSTDERR; then + debug_echo "apt-key net-update (success)" + else + debug_echo "apt-key net-update (failure)" + fi + # run apt-get update if eval apt-get $XAPTOPT -y update $XSTDERR; then debug_echo "download updated metadata (success)." if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then @@ -447,6 +454,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then fi update_stamp $UPDATE_STAMP UPDATED=1 + # now run apt-xapian-index if it is installed to ensure the index + # is up-to-date + if [ -x /usr/sbin/update-apt-xapian-index ]; then + nice ionice -c3 update-apt-xapian-index -q -u + fi else debug_echo "download updated metadata (error)" fi diff --git a/debian/apt.dirs b/debian/apt.dirs index f9c0b6c3e..828453655 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -13,4 +13,5 @@ var/lib/apt/lists/partial var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt +usr/share/apt usr/share/bug/apt diff --git a/debian/changelog b/debian/changelog index e92210052..cab53d034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,105 @@ apt (0.8.16~exp12ubuntu7) UNRELEASED; urgency=low + * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was + dropped in maverick. + * Build-depend on gettext:any for cross-building support. + * Don't treat build-depends-indep as cross-build-dependencies; we should + always install the host arch versions. LP: #968828. * Makefile, po/makefile: make sure our pot generation datestamp doesn't change at build time, since this makes translations fail to be co-installable with multiarch. Based on a patch by David Kalnischkies. Closes: #659333, LP: #924628. - -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 02 Apr 2012 07:40:54 +0000 + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 24 Mar 2012 00:05:43 -0700 + +apt (0.8.16~exp12ubuntu6) precise; urgency=low + + * cherry pick from + http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/: + * apt-pkg/packagemanager.cc: + - fix bug in predepends handling - ensure that packages that needs + unpackaging are unpacked before they are configured (LP: #927993) + * apt-pkg/packagemanager.cc: + - do not try to a void a breaks if the broken package pre-depends + on the breaker, but let dpkg auto-deconfigure it + * apt-pkg/packagemanager.cc: + - recheck all dependencies if we changed a package in SmartConfigure + as this could break an earlier dependency (LP: #940396) + * recheck dependencies in SmartUnpack after a change, too + * add Debug::pkgAcqArchive::NoQueue to disable package downloading + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Mar 2012 19:46:08 +0100 + +apt (0.8.16~exp12ubuntu5) precise; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid branch, most notably: + - Correct fi translation for hash sum mismatches (LP: #420403) + Thanks to Jani Uusitalo + - remove 'old' InRelease file if we can't get a new one before + proceeding with Release.gpg to avoid the false impression of a still + trusted repository by a (still present) old InRelease file. + Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Mar 2012 17:52:50 +0100 + +apt (0.8.16~exp12ubuntu4) precise; urgency=low + + * apt-pkg/contrib/fileutl.h: + - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Feb 2012 10:06:28 +0100 + +apt (0.8.16~exp12ubuntu3) precise; urgency=low + + * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to + handle compressed files again (LP: #924182). + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 31 Jan 2012 11:19:46 +0000 + +apt (0.8.16~exp12ubuntu2) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - chroot if needed before dpkg --assert-multi-arch + - ensure that dpkg binary doesn't have the chroot-directory prefixed + * apt-pkg/depcache.cc: + - if a M-A:same package is marked for reinstall, mark all it's installed + silbings for reinstallation as well (LP: #859188) + * apt-pkg/contrib/configuration.cc: + - do not stop parent transversal in FindDir if the value is empty + * methods/http{s,}.cc: + - if a file without an extension is requested send an 'Accept: text/*' + header to avoid that the server chooses unsupported compressed files + in a content-negotation attempt (Closes: #657560) + * apt-pkg/aptconfiguration.cc: + - chroot if needed before calling dpkg --print-foreign-architectures + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix crash when a package is in removed but residual config state + (LP: #923807) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Jan 2012 21:03:12 +0100 + +apt (0.8.16~exp12ubuntu1) precise; urgency=low + + [ Michael Vogt ] + * merge from debian/experimental: + - new ABI + + [ Steve Langasek ] + * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that + we resolve virtual package Breaks more effectively. Thanks to Colin + Watson for the patch. Closes: #657695, LP: #922485. + * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not + a signed short, because large upgrades can result in an overflow for + core packages. Thanks again to Colin Watson. Closes: #657732, + LP: #917173. + * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH. + Closes: #646288. + + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 29 Jan 2012 00:44:16 +0000 apt (0.8.16~exp12) experimental; urgency=low @@ -97,7 +191,8 @@ apt (0.8.16~exp9) experimental; urgency=low - use Lists instead of Sets if input order should be preserved for commands accepting lists of packages, e.g. policy (Closes: #625960) * apt-pkg/depcache.cc: - - prefer native providers over foreigns even if the chain is foreign + - prefer native providers over foreigns even if the chain is foreign. + LP: #850264. * cmdline/apt-get.cc: - ignore foreign architectures if we check if a provides has only one resolver as it's basically the same for the user, so no need to choose @@ -195,15 +290,198 @@ apt (0.8.16~exp6) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 21:06:51 +0200 +apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low + + [ Daniel Hahler ] + * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200 + +apt (0.8.16~exp5ubuntu14.2) precise; urgency=low + + * Call update-apt-xapian-index with -u on all arches in + cron.daily to make it behave slightly more pleasantly. + + -- Adam Conrad <adconrad@ubuntu.com> Mon, 09 Jan 2012 07:41:03 -0700 + +apt (0.8.16~exp5ubuntu14.1) precise; urgency=low + + * apt-pkg/edsp.cc: + - fix FTBFS + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 17:56:49 +0200 + +apt (0.8.16~exp5ubuntu14) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - refactor MergeList by creating -Group, -Package and -Version specialist + - share description list between "same" versions (LP: #868977) + This also means that descriptions are shared across archives now. + * apt-pkg/pkgcache.cc: + - always prefer "en" over "" for "en"-language regardless of cache-order + (LP: #868977) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 16:22:31 +0200 + +apt (0.8.16~exp5ubuntu13) oneiric; urgency=low + + [ Adam Conrad ] + * On armel, call update-apt-xapian-index with '-u' to keep the CPU + and I/O usage low. We would do this on all arches, but there's a + regression risk here, but that's better than killing slow systems. + + [ Michael Vogt ] + * cmdline/apt-key: + - fix apt-key net-update, thanks to Marc Deslauriers and + Adam Conrad for the code review (LP: #857472) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 06 Oct 2011 16:14:41 +0200 + +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - fix crash when the dynamic mmap needs to be remapped during + LoadReleaseInfo (LP: #854090) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Sep 2011 13:31:11 +0200 + +apt (0.8.16~exp5ubuntu11) oneiric; urgency=low + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + [ Marc Deslauriers ] + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is insecure. + - cmdline/apt-key: exit immediately out of net_update(). + - CVE number pending + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 22 Sep 2011 17:30:45 +0200 + +apt (0.8.16~exp5ubuntu10) oneiric; urgency=low + + * methods/https.cc: + - cleanup broken downloads properly (just like http) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 20 Sep 2011 18:26:13 +0200 + +apt (0.8.16~exp5ubuntu9) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc: + - fix fetching translated package descriptions (including the newly + stripped out english ones) by adding OptionalSubIndexTarget + + [ David Kalnischkies ] + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found try to verify with hashes, + but do not fail if a hash can't be found + * apt-pkg/indexrecords.cc: + - fix Acquire::Max-ValidTime option by interpreting it really + as seconds as specified in the manpage and not as days + - add an Acquire::Min-ValidTime option (Closes: #640122) + * doc/apt.conf.5.xml: + - reword Acquire::Max-ValidTime documentation to make clear + that it doesn't provide the new Min-ValidTime functionality + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 16 Sep 2011 09:50:16 +0200 + +apt (0.8.16~exp5ubuntu8) oneiric; urgency=low + + * cherry pick r1825 from lp:~mvo/apt/mvo: + * apt-pkg/contrib/configuration.cc: + - fix double delete (LP: #848907) + - ignore only the invalid regexp instead of all options + + * cherry pick r2165 from lp:~donkult/apt/sid: + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - output list of virtual package providers to c1out in -q=1 + instead of /dev/null to unbreak sbuild (LP: #816155) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 18:23:09 +0200 + +apt (0.8.16~exp5ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * cherry pick revision 2173 from lp:~donkult/apt/sid + + [ David Kalnischkies ] + - M-A:same lockstep unpack should operate on installed + packages first (LP: #835625) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 09:03:33 +0200 + +apt (0.8.16~exp5ubuntu6) oneiric; urgency=low + + [ Michael Vogt + * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to + Jonathan Riddell + + [ David Kalnischkies ] + * lots of cppcheck fixes + * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc: + - ignore "self"-conflicts for all architectures of a package + instead of just for the architecture of the package locked at + in the ordering of installations too (Closes: #802901) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Aug 2011 11:32:58 +0200 + +apt (0.8.16~exp5ubuntu5) oneiric; urgency=low + + * debian/control: + - fix VCS location + * methods/mirror.cc: + - include the architecture(s) in the query string as well so + that the server can make better decisions + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:03:19 +0200 + +apt (0.8.16~exp5ubuntu4) oneiric; urgency=low + + * Merge change from Robert Collins to upgrade ubuntu-keyring recommends + to a hard dependency to match Debian behaviour and fix LP: #816606 + + -- Adam Conrad <adconrad@ubuntu.com> Tue, 09 Aug 2011 14:48:24 -0600 + +apt (0.8.16~exp5ubuntu3) oneiric; urgency=low + + * apt-pkg/acquire.cc: + - fix potential divide-by-zero (LP: #823277) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 15:56:44 +0200 + +apt (0.8.16~exp5ubuntu2) oneiric; urgency=low + + * test/integration/test-hashsum-verification: + - add regression test for hashsum verification + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found, still load the hashes for + verification (closes: #636314) and add test + * apt-pkg/pkgcachegen.cc: + - fix incorrect comparision when checking sources.list freshness + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 09:22:14 +0200 + +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low + + * merged new version from debian/experimental, this includes + a ABI break and two new library packages + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 08 Aug 2011 14:30:07 +0200 + apt (0.8.16~exp5) experimental; urgency=low - * merged the latest debian-sid fixes * apt-pkg/makefile: - install sha256.h compat header * apt-pkg/pkgcachegen.{cc,h}: - use ref-to-ptr semantic in NewDepends() to ensure that the libapt does not segfault if the cache is remapped in between (LP: #812862) + (LP: #812862) - fix crash when P.Arch() was used but the cache got remapped * apt-pkg/acquire-item.{cc,h}: - do not check for a "Package" tag in optional index targets @@ -312,7 +590,7 @@ apt (0.8.16~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200 -apt (0.8.15.10) UNRELEASEDunstable; urgency=low +apt (0.8.15.10) unstable; urgency=high [ David Kalnischkies ] * algorithms.cc: @@ -325,6 +603,11 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low (Closes: #655590) * doc/po/de.po: - apply typo-fix from Michael Basse, thanks! (LP: #900770) + * apt-pkg/acquire-item.cc: + - remove 'old' InRelease file if we can't get a new one before + proceeding with Release.gpg to avoid the false impression of a still + trusted repository by a (still present) old InRelease file. + Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) [ Chris Leick ] * German manpage translation update @@ -336,8 +619,16 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low * Slovak (Ivan Masar). Closes: #652985 * Russian (Yuri Kozlov). Closes: #654844 * Hungarian (Gabor Kelemen). Closes: #655238 + * Polish (Michał Kułach). Closes: #656908 + * Danish (Joe Hansen). Closes: #658643 + * French: replace "étiquetage" by "épinglage" for "pinning" + + [ Michael Vogt ] + * merged patch from lp:~uusijani/apt/uusi-branch: + Correct fi translation for hash sum mismatches (LP: #420403) + Thanks to Jani Uusitalo - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:30:36 +0100 + -- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 14:14:26 +0100 apt (0.8.15.9) unstable; urgency=low @@ -462,6 +753,14 @@ apt (0.8.15.6) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 15 Aug 2011 09:20:35 +0200 +apt (0.8.15.5ubuntu1) oneiric; urgency=low + + * apt-pkg/pkgcachegen.{cc,h}: + - fix crash when P.Arch() was used but the cache got remapped + (LP: #812862) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Aug 2011 15:18:50 +0200 + apt (0.8.15.5) unstable; urgency=low [ David Kalnischkies ] @@ -470,6 +769,28 @@ apt (0.8.15.5) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 28 Jul 2011 16:49:15 +0200 +apt (0.8.15.4ubuntu2) oneiric; urgency=low + + * apt-pkg/contrib/fileutl.{cc,h}: + - add GetModificationTime() helper + * apt-pkg/pkgcachegen.cc: + - regenerate the cache if the sources.list changes to ensure + that changes in the ordering there will be honored by apt + * apt-pkg/sourcelist.{cc,h}: + - add pkgSourceList::GetLastModifiedTime() helper + * apt-pkg/pkgcachegen.{cc,h}: + - use ref-to-ptr semantic in NewDepends() to ensure that the + libapt does not segfault if the cache is remapped in between + (LP: #812862) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 18:25:22 +0200 + +apt (0.8.15.4ubuntu1) oneiric; urgency=low + + * merged from debian-sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jul 2011 13:19:49 +0200 + apt (0.8.15.4) unstable; urgency=low [ David Miller ] @@ -534,6 +855,39 @@ apt (0.8.15.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 25 Jul 2011 15:04:43 +0200 +apt (0.8.15.2ubuntu2) oneiric; urgency=low + + * cmdline/apt-get.cc: + - fix missing download progress in apt-get download + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Jul 2011 13:20:49 +0200 + +apt (0.8.15.2ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - improve error message for a expired Release file + * apt-pkg/algorithms.cc: + - Hold back packages that would enter "policy-broken" state on upgrade + when doing a "apt-get upgrade" + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - fallback to memory if file is not writeable even if access() + told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) + * doc/sources.list.5.xml: + - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Jul 2011 10:16:45 +0200 + apt (0.8.15.2) unstable; urgency=high * fix from David Kalnischkies for the InRelease gpg verification @@ -541,6 +895,24 @@ apt (0.8.15.2) unstable; urgency=high -- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200 +apt (0.8.15.1ubuntu2) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - do not report errors encountered when decompressing packages + + [ Michael Vogt ] + * fix from David Kalnischkies for the InRelease gpg verification + code (LP: #784473) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Jul 2011 14:42:02 +0200 + +apt (0.8.15.1ubuntu1) oneiric; urgency=low + + * merge from debian/sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Jun 2011 09:16:12 +0100 + apt (0.8.15.1) unstable; urgency=low [ David Kalnischkies ] @@ -564,6 +936,17 @@ apt (0.8.15.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 30 Jun 2011 10:05:36 +0200 +apt (0.8.15ubuntu1) oneiric; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Jun 2011 09:03:39 +0100 + apt (0.8.15) unstable; urgency=low [ Julian Andres Klode ] @@ -852,6 +1235,101 @@ apt (0.8.14.2) UNRELEASED; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.changelog: + - add missing ";", thanks to Julian Andres Klode + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - updated allocate memory string + - cannot access archive string is lowercase + * apt-pkg/deb/dpkgpm.cc: + - resolve issue where AptOrdering is included in DpkgTerminalLog in apport + attachments + + -- Brian Murray <brian@ubuntu.com> Wed, 15 Jun 2011 14:00:43 -0700 + +apt (0.8.14.1ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/deblistparser.cc: + - include all known languages when building the apt cache + (LP: #794907) + * apt-pkg/deb/debindexfile.cc: + - remove some no longer valid checks for "TranslationsAvailable()" + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Jun 2011 13:56:25 +0200 + +apt (0.8.14.1ubuntu6) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - prevent reporting of package installation failures due to inaccessible + local files (LP: #791102, #790040) + - include /var/log/apt/history.log in apport-package reports so we know + the context for the package management request + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Jun 2011 15:55:07 +0200 + +apt (0.8.14.1ubuntu5) oneiric; urgency=low + + * apt-pkg/acquire-item.cc: + - do not reject empty Packages files when checking them for + correctness + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 May 2011 10:41:30 +0200 + +apt (0.8.14.1ubuntu4) oneiric; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 May 2011 17:12:27 +0200 + +apt (0.8.14.1ubuntu3) oneiric; urgency=low + + * Rebuild with recent binutils. LP: #774175. + + -- Matthias Klose <doko@ubuntu.com> Mon, 23 May 2011 19:15:34 +0200 + +apt (0.8.14.1ubuntu2) oneiric; urgency=low + + * debian/rules: + - build in verbose mode by default (thanks to Matthias Klose) + * debian/control: + - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 May 2011 13:58:10 +0200 + +apt (0.8.14.1ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid bzr branch + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Apr 2011 17:55:20 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: @@ -894,6 +1372,42 @@ apt (0.8.14) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Fri, 15 Apr 2011 14:28:15 +0200 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray <brian@ubuntu.com> Wed, 20 Apr 2011 15:05:12 -0700 + +apt (0.8.13.2ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Apr 2011 12:52:21 +0200 + +apt (0.8.13.2ubuntu1) natty; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] @@ -930,6 +1444,12 @@ apt (0.8.13.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200 +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid (LP: #744832) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Apr 2011 14:40:51 +0200 + apt (0.8.13.1) unstable; urgency=low * apt-pkg/acquire-item.cc: Use stat buffer if stat was @@ -937,6 +1457,24 @@ apt (0.8.13.1) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Sat, 02 Apr 2011 20:55:35 +0200 +apt (0.8.13ubuntu2) natty; urgency=low + + * po/makefile: + - add hack to run MSGMERGE again if it segfaults. this is to help + powerpc to bootstrap + * mirror method: + - merge fix from Matt Zimmerman, many thanks (LP: #741098) + - do not crash if the mirror file fails to download + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Mar 2011 18:01:38 +0100 + +apt (0.8.13ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the + apt mirror method + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] @@ -958,6 +1496,29 @@ apt (0.8.13) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100 +apt (0.8.12ubuntu2) unstable; urgency=low + + [ Thorsten Spindler ] + * methods/rsh.cc + - fix rsh/ssh option parsing (LP: #678080), thanks to + Ville Mattila + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - mark pkgAcqIndexTrans as Index-File to avoid asking the + user to insert the CD on each apt-get update + * methods/mirror.cc: + - improve debug output and fix bug in TryNextMirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100 + +apt (0.8.12ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the udev based + cdrom handling and multiarch handling + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 16:12:22 +0100 + apt (0.8.12) unstable; urgency=low [ Michael Vogt ] @@ -1011,6 +1572,23 @@ apt (0.8.12) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 10 Mar 2011 14:46:48 +0100 +apt (0.8.11.5ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/debindexfile.cc: + - ignore missing deb-src files in /var/lib/apt/lists, thanks + to Thorsten Spindler (LP: #85590) + * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: + - honor Dpkg::Chroot-Directory in the RunScripts*() methods + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Mar 2011 17:39:30 +0100 + +apt (0.8.11.5ubuntu1) natty; urgency=low + + * Merged from debian/sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Feb 2011 12:01:19 +0100 + apt (0.8.11.5) unstable; urgency=low [ Christian Perrier ] @@ -1242,6 +1820,27 @@ apt (0.8.10.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 17 Jan 2011 13:41:04 +0100 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - ignore lzma "Cannot allocate memory" errors, thanks to Brian + Murray + - add i18n support for the "short read in buffer_copy %s" handling + from dpkg + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Jan 2011 18:26:05 +0100 + +apt (0.8.10ubuntu1) natty; urgency=low + + [ Julian Andres Klode ] + * cmdline/apt-cache.cc: Create an error for apt-cache depends + if packages could not found (LP: #647045) + + [ Michael Vogt ] + * merged from debian-sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Dec 2010 15:53:49 +0100 + apt (0.8.10) unstable; urgency=low [ Programs translations ] @@ -1261,6 +1860,48 @@ apt (0.8.10) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 30 Nov 2010 10:42:17 +0100 +apt (0.8.9ubuntu4) natty; urgency=low + + [ Michael Vogt ] + * cmdline/apt-key: + - set timeout of wget for net-update to 90 seconds (thanks to \sh) + + [ Martin Pitt ] + * Revert r1819 and r1820 to disable compressed indexes by default again. + Testing has brought up a few places where this seriously degrades + performance, mostly in applications which iterate through all available + package records, like update-apt-xapian-index or synaptic. See + https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Nov 2010 08:50:37 +0100 + +apt (0.8.9ubuntu3) natty; urgency=low + + * methods/http.cc: + - do not hang if Acquire::http::ProxyAutoDetect can not be + executed or returns no data (LP: #654393) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Nov 2010 10:42:50 +0100 + +apt (0.8.9ubuntu2) natty; urgency=low + + * drop apt-changelog, apt-get changelog implements all the + features it provides + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:22:40 +0100 + +apt (0.8.9ubuntu1) natty; urgency=low + + * re-merged from the debian-sid bzr branch + * merged lp:~mvo/apt/mvo, this brings two new commands: + - apt-get download binary-pkgname to download a deb + - apt-get changelog binary-pkgname to display the changelog + * cmdline/apt-get.cc: + - if the changelog download failed, do not show the generic error + but point to launchpad instead + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:02:14 +0100 + apt (0.8.9) unstable; urgency=low [ Christian Perrier ] @@ -1292,6 +1933,47 @@ apt (0.8.9) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 18 Nov 2010 09:25:04 +0100 +apt (0.8.8ubuntu3) natty; urgency=low + + * cmdline/apt-changelog: Filter out multiple results for a source package, + just take the latest one. + * cmdline/apt-changelog: Read server name from configuration + APT::Changelog::Server instead of hardcoding it. This allows local users + to point to a local changelog mirror, or make this script work for Debian. + * Add debian/apt.conf.changelog: Configuration for apt-changelog with the + server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules. + * doc/apt-changelog.1.xml: Document the new option. + * test/integration/test-compressed-indexes, test/test-indexes.sh: + - Explicitly disable compressed indexes at the start. This ensures that we + will actually test uncompressed indexes regardless of the internal + default value of Acquire::GzipIndexes. + * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to + store compressed indexes. This feature is now mature enough for general + consumption. Update doc/apt.conf.5.xml accordingly. + * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default + to preferring "gz", so that compressed indexes will actually work. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Nov 2010 12:14:15 +0100 + +apt (0.8.8ubuntu2) natty; urgency=low + + * Add cmdline/apt-changelog: Script to fetch package changelog from + changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules. + * Add doc/apt-changelog.1.xml, and install it in debian/rules. + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 09 Nov 2010 11:32:27 +0100 + +apt (0.8.8ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Oct 2010 10:07:09 -0400 + apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] @@ -1311,6 +1993,17 @@ apt (0.8.8) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 28 Oct 2010 21:22:21 +0200 +apt (0.8.7ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Oct 2010 18:31:17 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] @@ -1429,6 +2122,92 @@ apt (0.8.4) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 10 Sep 2010 20:45:15 +0200 +apt (0.8.3ubuntu7) maverick; urgency=low + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - do not remove packages which the user requested for installation + explicitly while satisfying other install requests (Closes: #598669) + Test case: debootstrap, install exim4, run "apt-get install postfix" + This will result in exim4-heavy instead of postfix + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Oct 2010 14:13:38 +0200 + +apt (0.8.3ubuntu6) maverick; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - source /etc/default/locale (if available) so that the + apt-get update cron job fetches the right translated package + descriptions (LP: #652951) + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - do not check endpointer packages instead of only those which prevented + NeverAutoRemove settings from having an effect (Closes: #598452) + * cmdline/apt-cache.cc: + - use the TranslatedDescription for searching and not the first + available one as it is maybe not an expected language (Closes: #597925) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Oct 2010 15:25:00 +0200 + +apt (0.8.3ubuntu5) maverick; urgency=low + + * debian/apt.dirs: + - add missing /usr/share/apt so that the keyring is installed + into the right place (LP: #620576) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 22 Sep 2010 18:34:18 +0200 + +apt (0.8.3ubuntu4) maverick; urgency=low + + * merged lp:~mvo/apt/conflicts-on-virtuals to better deal + with conflicts/breaks against virtual packages (LP: #614993) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:48:26 +0200 + +apt (0.8.3ubuntu3) maverick; urgency=low + + * merged fixes from debian-sid + + [ Michael Vogt ] + * apt-pkg/contrib/cdromutl.cc: + - if apt-cdrom is used on writable media (like usb-sticks), do + not use the root directory to identify the medium (as all + changes there change the ident id). Use the .disk directory + instead + + [ David Kalnischkies ] + * ftparchive/writer.cc: + - null the valid string instead of the date if Valid-Until is not set + * apt-pkg/acquire-item.cc: + - use also unsigned Release files again (Closes: #596189) + + [ Christian Perrier ] + * Fix missing space after dot in a message from apt-pkg + Translations unfuzzied. Thanks to Holger Wansing. + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Sep 2010 21:45:49 +0200 + +apt (0.8.3ubuntu2) maverick; urgency=low + + * ftparchive/writer.cc: + - write out {Files,Checksum-Sha1,Checksum-Sha256} only if + available LP: #633967. Thanks to Colin Watson + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200 + +apt (0.8.3ubuntu1) maverick; urgency=low + + * merged fixes from debian-sid + * debian/rules: + - put ubuntu-archive.gpg back into the package (LP: #620576) + * apt-pkg/init.cc: + - ignore ".distUpgrade" and ".save" files in sources.list.d + (LP: #631770) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200 + apt (0.8.3) unstable; urgency=low [ Programs translations ] @@ -1521,6 +2300,69 @@ apt (0.8.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200 +apt (0.8.0ubuntu3) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Simplified Chinese (Aron Xu). Closes: #594458 + * Bulgarian (Damyan Ivanov). Closes: #594627 + * Portuguese (Miguel Figueiredo). Closes: #594668 + * Korean (Changwoo Ryu). Closes: #594809 + + [ Manpages translations ] + * Portuguese (Américo Monteiro) + + [ David Kalnischkies ] + * cmdline/apt-cache.cc: + - remove useless GetInitialize method + * cmdline/apt-get.cc: + - remove direct calls of ReadMainList and use the wrapper instead + to protect us from useless re-reads and two-times notice display + - remove death code by removing unused GetInitialize + * apt-pkg/depcache.cc: + - now that apt-get purge works on 'rc' packages let the MarkDelete + pass this purge forward to the non-pseudo package for pseudos + * apt-pkg/contrib/fileutl.cc: + - apply SilentlyIgnore also on files without an extension + * apt-pkg/contrib/configuration.cc: + - fix autoremove by using correct config-option name and + don't make faulty assumptions in error handling (Closes: #594689) + * apt-pkg/versionmatch.cc: + - let the pin origin actually work as advertised in the manpage + which means "" are optional and pinning a local archive does + work - even if it is a non-flat archive (Closes: #594435) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 17:05:53 +0200 + +apt (0.8.0ubuntu2) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Thai (Theppitak Karoonboonyanan). Closes: #592695 + * Russian (Yuri Kozlov). Closes: #594232 + * Slovak (Ivan Masár). Closes: #594255 + * Swedish (Daniel Nylander). Closes: #594241 + * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265 + * Italian (Milo Casagrande). Closes: #594238 + * Asturian (maacub). Closes: #594303 + + [ Christian Perrier ] + * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki + Closes: #594211 + + [ David Kalnischkies ] + * show in madison command again also source packages (LP: #614589) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Aug 2010 18:56:23 +0200 + +apt (0.8.0ubuntu1) maverick; urgency=low + + * merged from debian/unstable + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200 + apt (0.8.0) unstable; urgency=low [ Michael Vogt ] @@ -1563,6 +2405,20 @@ apt (0.8.0~pre2) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 23 Aug 2010 19:09:08 +0200 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - enable apport reports again (got lost in the previous merge), + thanks to Matt Zimmerman + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Aug 2010 13:53:09 +0200 + +apt (0.8.0~pre1ubuntu1) maverick; urgency=low + + * merged fixes from debian/experimental + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 17:49:40 +0200 + apt (0.8.0~pre1) experimental; urgency=low [ Programs translations ] @@ -1605,6 +2461,56 @@ apt (0.8.0~pre1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 13 Aug 2010 17:00:49 +0200 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/fileutl.cc: + - Add WriteAtomic mode. + - Revert WriteEmpty to old behavior (LP: #613211) + * apt-pkg, methods: + - Convert users of WriteEmpty to WriteAtomic. + * apt-pkg/depcache.cc: + - Only try upgrade for Breaks if there is a newer version, otherwise + handle it as Conflicts (by removing it) (helps for #591882). + + [ Michael Vogt ] + * debian/control: + - Add recommends on gnupg to apt, apt-key uses it. + (changed from debian) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Aug 2010 12:01:30 +0200 + +apt (0.7.26~exp12ubuntu3) maverick; urgency=low + + [ Colin Watson ] + * apt-pkg/cdrom.cc: + - fix off-by-one error in DropBinaryArch + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200 + +apt (0.7.26~exp12ubuntu2) maverick; urgency=low + + * debian/apt.postinst: + - do not fail if ubuntu-keyring is not installed + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200 + +apt (0.7.26~exp12ubuntu1) maverick; urgency=low + + * ABI break upload + * merged from debian/experimental, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + * debian/apt.postinst + - drop set_apt_proxy_from_gconf(), no longer needed in maverick + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200 + apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] @@ -2219,6 +3125,152 @@ apt (0.7.26~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100 +apt (0.7.25.3ubuntu10) maverick; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.ubuntu: + - no longer install (empty) apt.conf.d/01ubuntu + * apt-pkg/deb/dpkgpm.cc: + - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) + - fix FTBFS (LP: #600155) + + [ Matthias G. ] + * apt-pkg/deb/dpkgpm.cc: + - Fix segmentation fault when /var/log/apt ist missing. LP: #535509 + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Jul 2010 09:37:03 +0200 + +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low + + * debian/apt.postinst: + - do not fail if getent returns nothing useful (LP: #579647) + thanks to Jean-Baptiste Lallement + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200 + +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low + + [ Loïc Minier ] + * Use https:// in Vcs-Bzr URL. + + [ Michael Vogt ] + * apt-pkg/deb/debrecords.cc: + - fix max tag buffer size (LP: #545336, closes: #578959) + * apt-pkg/indexfile.cc: + - If no "_" is found in the language code, try to find a "." + This is required for languages like Esperanto that have no + county associated with them (LP: #560956) + Thanks to "Aisano" for the fix + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200 + +apt (0.7.25.3ubuntu7) lucid; urgency=low + + Cherry pick fixes from the lp:~mvo/apt/mvo branch: + + [ Evan Dandrea ] + * Remember hosts with general failures for + https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831). + + [ Michael Vogt ] + * improve debug output for Debug::pkgPackageManager + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200 + +apt (0.7.25.3ubuntu6) lucid; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty (LP: #556056) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200 + +apt (0.7.25.3ubuntu5) lucid; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - try version match in FindSrc first exact than fuzzy (LP: #551178) + + [ Jean-Baptiste Lallement ] + * apt-pkg/contrib/strutl.cc: + - always escape '%' (LP: #130289) (Closes: #500560) + - unescape '%' sequence only if followed by 2 hex digit + - username/password are urlencoded in proxy string (RFC 3986) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200 + +apt (0.7.25.3ubuntu4) lucid; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + LP: #540228 + * cmdline/apt-get.cc, apt-pkg/cdrom.cc: + - fix memory leaks in error conditions in DoSource() + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Mar 2010 16:57:49 +0100 + +apt (0.7.25.3ubuntu3) lucid; urgency=low + + * apt-pkg/indexfile.cc: + - remove "cs" from languages that need the full langcode when + downloading translations (thanks to Steve Langasek) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Mar 2010 09:42:39 +0100 + +apt (0.7.25.3ubuntu2) lucid; urgency=low + + [ Michael Vogt ] + * abicheck/ + - add new abitest tester using the ABI Compliance Checker from + http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker + * debian/apt.conf.autoremove: + - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used + for transitional packages + * apt-pkg/deb/dpkgpm.cc: + - fix backgrounding when dpkg runs (closes: #486222) + * cmdline/apt-mark: + - show error on incorrect aguments (LP: #517917), thanks to + Torsten Spindler + * cmdline/apt-get.cc: + - if apt-get source foo=version or foo/distro can not be found, + error out (LP: #502641) + * apt-pkg/indexfile.cc: + - deal correctly with three letter langcodes (LP: #391409) + * debian/apt.cron.daily: + - do not look into admin users gconf anymore for the http proxy + the user now needs to use the "Apply system-wide" UI in the + gnome-control-center to set it + * debian/apt.postinst: + - add set_apt_proxy_from_gconf() and run that once on upgrade if + there is no proxy configured already system-wide (LP: #432631) + From that point on gnome-control-center will have to warn if + the user makes changes to the proxy settings and does not apply + them system wide + + [ Robert Collins ] + * Change the package index Info methods to allow apt-cache policy to be + useful when using several different archives on the same host. + (Closes: #329814, LP: #22354) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Mar 2010 23:10:52 +0100 + +apt (0.7.25.3ubuntu1) lucid; urgency=low + + [ Michael Vogt ] + * merged with the debian-sid branch + * methods/http.cc: + - add Acquire::http::ProxyAutoDetect configuration that + can be used to call a external helper to figure out the + proxy configuration and return it to apt via stdout + (this is a step towards WPAD and zeroconf/avahi support) + + [ Ivan Masár ] + * Slovak translation update. Closes: #568294 + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Feb 2010 23:33:32 +0100 + apt (0.7.25.3) unstable; urgency=low [ Christian Perrier ] @@ -2339,6 +3391,39 @@ apt (0.7.25.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Sat, 09 Jan 2010 21:52:36 +0100 +apt (0.7.25ubuntu4) lucid; urgency=low + + * cmdline/apt-cdrom.cc: + - make Acquire::cdrom::AutoDetect default, this can be + turned off with "--no-auto-detect" + * methods/http.cc: + - add cache-control headers even if no cache is given to allow + adding options for intercepting proxies + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Feb 2010 16:58:59 -0800 + +apt (0.7.25ubuntu3) lucid; urgency=low + + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) + + -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100 + +apt (0.7.25ubuntu2) lucid; urgency=low + + * Change history branch so that it does not break the + apt ABI for the pkgPackageManager interface + (can be reverted on the next ABI break) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 10:14:16 +0100 + +apt (0.7.25ubuntu1) lucid; urgency=low + + * Merged from the mvo branch + * merged from the lp:~mvo/apt/history branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100 + apt (0.7.25) unstable; urgency=low [ Christian Perrier ] @@ -2482,6 +3567,29 @@ apt (0.7.25) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100 +apt (0.7.24ubuntu1) lucid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - include df -l output in the apport log as well (thanks to + tjaalton) + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used + * methods/https.cc: + - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 + thanks to Brian Thomason for the patch + * merge lp:~mvo/apt/netrc branch, this adds support for a + /etc/apt/auth.conf that can be used to store username/passwords + in a "netrc" style file (with the extension that it supports "/" + in a machine definition). Based on the maemo git branch. + + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Dec 2009 09:27:26 +0100 + apt (0.7.24) unstable; urgency=low [ Nicolas François ] @@ -2551,6 +3659,59 @@ apt (0.7.24) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200 +apt (0.7.23.1ubuntu2) karmic; urgency=low + + [ Michael Vogt ] + * debian/control: + - fix Vcr-Bzr header + + [ Kees Cook ] + * debian/apt.cron.daily: + - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200 + +apt (0.7.23.1ubuntu1) karmic; urgency=low + + [ Matt Zimmerman ] + * apt-pkg/deb/dpkgpm.cc: + - Suppress apport reports on dpkg short reads (these I/O errors are not + generally indicative of a bug in the packaging) + + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) + + [ Brian Murray ] + * cmdline/apt-get.cc: + - typo fix (LP: #370094) + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - when tcgetattr() returns non-zero skip all pty magic + (thanks to Simon Richter, closes: #509866) + * apt-inst/contrib/arfile.cc: + - show propper error message for Invalid archive members + * apt-pkg/acquire-worker.cc: + - show error details of failed methods + * apt-pkg/contrib/fileutl.cc: + - if a process aborts with signal, show signal number + * methods/http.cc: + - ignore SIGPIPE, we deal with EPIPE from write in + HttpMethod::ServerDie() (LP: #385144) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it + (LP: #135262) + + [ Merge ] + * merged from debian, reverted the libdlopen-udev branch + because its too late in the release process for this now + * not merged the proxy behaviour change from 0.7.23 (that will + be part of lucid) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200 + apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] @@ -2780,6 +3941,34 @@ apt (0.7.22) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200 +apt (0.7.21ubuntu1) karmic; urgency=low + + * merged from the debian-sid bzr branch + + [ Christian Perrier ] + * Documentation translations: + - Fix a typo in apt-get(8) French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + * Translations: + - fr.po + - sk.po. Closes: #525857 + - ru.po. Closes: #526816 + - eu.po. Closes: #528985 + - zh_CN.po. Closes: #531390 + - fr.po + - it.po. Closes: #531758 + - ca.po. Closes: #531921 + * Added translations + - ast.po (Asturian by Marcos Alvareez Costales). + Closes: #529007, #529730 + + [ Michael Vogt ] + * apt-pkg/acquire.cc: + - make the (internal) max pipeline depth of the acquire queue + configurable via Acquire::Max-Pipeline-Depth + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] @@ -2823,6 +4012,125 @@ apt (0.7.21) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200 +apt (0.7.20.2ubuntu7) karmic; urgency=low + + * fix problematic use of tolower() when calculating the version + hash by using locale independant tolower_ascii() function. + Thanks to M. Vefa Bicakci (LP: #80248) + * build fixes for g++-4.4 + * include dmesg output in apport package failures + * include apt ordering into apport package failures + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Apr 2009 10:14:01 +0200 + +apt (0.7.20.2ubuntu6) jaunty; urgency=low + + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files (LP: #354793) + + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + LP: #356012 + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Apr 2009 22:39:50 +0200 + +apt (0.7.20.2ubuntu5) jaunty; urgency=low + + [ Colin Watson ] + * cmdline/acqprogress.cc: + - Call pkgAcquireStatus::Pulse even if quiet, so that we still get + dlstatus messages on the status-fd (LP: #290234). + + [ Michael Vogt ] + * debian/apt.cron.daily: + - do not clutter cron mail with bogus gconftool messages + (LP: #223502) + - merge fix for cache locking from debian (closes: #459344) + - run update-apt-xapian-index (with ionice) to ensure that + the index is up-to-date when synaptic is run (LP: #288797) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200 + +apt (0.7.20.2ubuntu4) jaunty; urgency=low + + * ftparchive/cachedb.cc: + - when apt-ftparchive clean is used, compact the database + at the end (thanks to cprov) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Mar 2009 13:43:59 +0100 + +apt (0.7.20.2ubuntu3) jaunty; urgency=low + + * methods/mirror.cc: + - when download the mirror file and the server is down, + return a propper error message (LP: #278635) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Mar 2009 15:42:15 +0100 + +apt (0.7.20.2ubuntu2) jaunty; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - revert termios patch (LP: #338514) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Mar 2009 16:33:28 +0100 + +apt (0.7.20.2ubuntu1) jaunty; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + + [ Michael Vogt ] + * merged from the debian-sid branch + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove + blacklist + * fix some i18n issues (thanks to Gabor Kelemen) + LP: #263089 + * apt-pkg/deb/dpkgpm.cc: + - filter "ENOMEM" errors when creating apport reports + * cmdline/apt-get.cc: + - fix "apt-get source pkg=ver" if binary name != source name + (LP: #202219) + * apt-pkg/indexrecords.cc: + - fix some i18n issues + * apt-pkg/contrib/strutl.h: + - add new strprintf() function to make i18n strings easier + * apt-pkg/dev/debsystem.cc: + - add missing apti18n.h header + * cmdline/apt-get.cc: + - default to "false" for the "APT::Get::Build-Dep-Automatic" + option (follow debian here) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) + * methods/https.cc: + - add Acquire::https::AllowRedirect support + - do not unlink files in partial/ (thanks to robbiew) + + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100 + apt (0.7.20.2) unstable; urgency=medium [ Eugene V. Lyubimkin ] @@ -2891,6 +4199,12 @@ apt (0.7.20) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100 +apt (0.7.19ubuntu1) jaunty; urgency=low + + * merge from debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +0100 + apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] @@ -3189,6 +4503,90 @@ apt (0.7.15~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200 +apt (0.7.14ubuntu7) jaunty; urgency=low + + * cmdline/apt-cache.cc: + - remove the gettext from a string that consists entirely + of variables (LP: #56792) + * apt-pkg/deb/dpkgpm.cc: + - fix potential hang when in a backgroud process group + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2008 21:09:12 +0100 + +apt (0.7.14ubuntu6) intrepid; urgency=low + + * debian/apt.conf.autoremove: + - remove "linux-image" (and friends) from the auto-remove + blacklist. we have the kernel fallback infrastructure now + in intrepid (thanks to BenC) + * apt-pkg/indexcopy.cc: + - support having CDs with no Packages file (just a Packages.gz) + by not forcing a verification on non-existing files + (LP: #255545) + * apt-pkg/deb/dpkgpm.cc: + - improve the filtering for duplicated apport reports (thanks + to seb128 for pointing that problem out) + - do not report disk full errors from dpkg via apport + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Aug 2008 16:28:05 +0200 + +apt (0.7.14ubuntu5) intrepid; urgency=low + + * fix various -Wall warnings + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Aug 2008 14:00:51 +0200 + +apt (0.7.14ubuntu4) intrepid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix uninitialized variable that caused no apport reports + to be written sometimes (thanks to Matt Zimmerman) + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * document --install-recommends and --no-install-recommends + (thanks to Dereck Wonnacott, LP: #126180) + + [ Dereck Wonnacott ] + * apt-ftparchive might write corrupt Release files (LP: #46439) + * Apply --important option to apt-cache depends (LP: #16947) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Aug 2008 10:10:49 +0200 + +apt (0.7.14ubuntu3) intrepid; urgency=low + + [ Otavio Salvador ] + * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan + Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476 + * Avoid using dbus if dbus-daemon isn't running. Closes: #438803 + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - improve apt progress reporting, display trigger actions + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (LP: #236360) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 Jun 2008 17:27:07 +0200 + +apt (0.7.14ubuntu2) intrepid; urgency=low + + * debian/control: + - fix FTBFS by adding missing intltool dependency + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 09 May 2008 13:50:22 +0200 + apt (0.7.14) unstable; urgency=low [ Christian Perrier ] @@ -3415,6 +4813,268 @@ apt (0.7.10) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 07 Jan 2008 21:40:47 +0100 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low + + * apt-pkg/acquire-item.cc: + - fix signaure removal on transient network failures LP: #220627 + (thanks to Scott James Remnant) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Apr 2008 16:32:49 +0200 + +apt (0.7.9ubuntu16) hardy; urgency=low + + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200 + +apt (0.7.9ubuntu15) hardy; urgency=low + + * cmdline/apt-get.cc: + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies. This should + fix livecd building for kubuntu (thanks to Jonathan Riddell + for reporting the problem) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Mar 2008 23:25:45 +0100 + +apt (0.7.9ubuntu14) hardy; urgency=low + + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + - run the problemResolver after a task was installed + so that it can correct any missing dependencies + * typo fixes (LP: #107960) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Mar 2008 21:46:07 +0100 + +apt (0.7.9ubuntu13) hardy; urgency=low + + [ Lionel Porcheron ] + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) + + [ Michael Vogt ] + * doc/apt_preferences.5.xml: + - fix typo (LP: #150900) + * doc/example/sources.list: + - updated for hardy (LP: #195879) + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Mar 2008 15:35:09 +0100 + +apt (0.7.9ubuntu12) hardy; urgency=low + + * debian/apt.cron.daily: + - use admin user proxy settings + * cmdline/apt-get.cc: + - fix task installation (thanks to Colin Watson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100 + +apt (0.7.9ubuntu11) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + (LP: #188127) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100 + +apt (0.7.9ubuntu10) hardy; urgency=low + + * cmdline/apt-key: + - add "net-update" command that fetches the + ubuntu-archive-keyring.gpg and add keys from it that are + signed by the ubuntu-master-keyring.gpg + (apt-archive-key-signatures spec) + * debian/apt.cron.daily: + - add apt-key net-update to the nightly cron job + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Feb 2008 15:50:28 +0100 + +apt (0.7.9ubuntu9) hardy; urgency=low + + * fix FTBFS due to incorrect intltool build-depends + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 16:04:37 +0100 + +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100 + +apt (0.7.9ubuntu7) hardy; urgency=low + + * methods/connect.cc: + - remember hosts with Resolve failures or connect Timeouts + see https://wiki.ubuntu.com/NetworklessInstallationFixes + * cmdlines/apt-key: + - fix bug in the new apt-key update code that imports only + keys signed with the master key (thanks to cjwatson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Feb 2008 11:38:35 +0100 + +apt (0.7.9ubuntu6) hardy; urgency=low + + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * apt-pkg/deb/dpkgpm.cc: + - add APT::Apport::MaxReports to limit the maximum number + of reports generated in a single run (default to 3) + * apt-pkg/deb/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Feb 2008 14:28:02 +0100 + +apt (0.7.9ubuntu5) hardy; urgency=low + + * Merged apt-authentication-reliabilty branch. This means + that apt will refuse to update and use the old lists if + the authentication of a repository that used to be + authenticated fails. See + https://wiki.ubuntu.com/AptAuthenticationReliability + for more details. + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jan 2008 10:36:10 +0100 + +apt (0.7.9ubuntu4) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to + true, the effect of the compatibility code was to require both of them + to be set to false in order to disable list cleanup; this broke the + installer. Instead, disable list cleanup if either of them is set to + false. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:34:37 +0000 + +apt (0.7.9ubuntu3) hardy; urgency=low + + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 19:02:11 +0100 + +apt (0.7.9ubuntu2) hardy; urgency=low + + [ Otavio Salvador ] + * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan <rmh@aybabtu.com> to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston <alexander.winston@comcast.net> + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + [ Program translations ] + - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. + + [ Michael Vogt ] + * apt-pkg/packagemanager.{cc,h}: + - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder. (LP: #179247) + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jan 2008 11:31:45 +0100 + +apt (0.7.9ubuntu1) hardy; urgency=low + + * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining + changes: + - mirror download method (pending merge with debian) + - no pdiff download by default (unsuitable for ubuntu) + - no recommends-by-default yet + - add "Original-Maintainer" field to tagfile + - show warning on apt-get source if the package is maintained + in a VCS (pedinging merge with debian) + - use ubuntu-archive keyring instead of debians one + - support metapackages section for autoremoval + - debian maintainer field change + - send ubuntu string in user-agent + + * Changes from the debian-sid bzr branch (but not uploaded to debian + yet): + + [ Otavio Salvador ] + * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + + [ Program translations ] + - Basque updated. Closes: #453088 + + [ Michael Vogt ] + * debian/rules + - fix https install location + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * methods/mirror.{cc,h}: + - only update mirror list on IndexFile updates + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 14:46:27 +0100 + apt (0.7.9) unstable; urgency=low [ Christian Perrier ] @@ -3540,6 +5200,193 @@ apt (0.7.7) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - give up timeslice on EIO error in read from master terminal + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Martin Emrich ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - rewrite dpkgpm.cc to use pselect() instead of select() + to block signals during select() (LP: #134858) + + -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 20 Oct 2007 07:51:12 +0200 + +apt (0.7.6ubuntu14) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix resource leak (LP: #148806) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Oct 2007 20:57:44 +0200 + +apt (0.7.6ubuntu13) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix crash in WriteApportReport (LP: #144537) + * apt-pkg/acquire-item.cc + - fix disappearing local Packages.gz file (LP: #131166) + * methods/https.cc: + - fix off-by-one error I-M-S handling + - cleanup after I-M-S hit + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Oct 2007 01:48:26 +0200 + +apt (0.7.6ubuntu12) gutsy; urgency=low + + [ Michael Vogt ] + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file + (thanks to Laurent Bigonville, LP: #140019) + * apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray <rmurray@debian.org> for the patch + + [Paul Sladen] + * Have 'cron.daily/apt' send D-Bus doesn't exist error messages + to the bit bucket. Thanks to 'dasdda'. (LP: #115397) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 03 Oct 2007 02:17:45 +0200 + +apt (0.7.6ubuntu11) gutsy; urgency=low + + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 (LP: #144001) + + -- Colin Watson <cjwatson@ubuntu.com> Sat, 22 Sep 2007 21:39:29 +0100 + +apt (0.7.6ubuntu10) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix parse error when dpkg sends unexpected data + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Sep 2007 17:25:09 +0100 + +apt (0.7.6ubuntu9) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix progress reporting precent calculation (LP: #137798) + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + (LP: #136767) + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes LP: #125733 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled (LP: #139448) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200 + +apt (0.7.6ubuntu8) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.{cc,h}: + - fix bug in dpkg log writing when a signal is caught during + select() (LP: #134858) + - write end marker in the log as well + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 Sep 2007 15:03:46 +0200 + +apt (0.7.6ubuntu7) gutsy; urgency=low + + * reupload to fix FTBFS + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Aug 2007 19:44:20 +0200 + +apt (0.7.6ubuntu6) gutsy; urgency=low + + * dpkg-triggers: Deal properly with new package states. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 15 Aug 2007 20:44:37 +0100 + +apt (0.7.6ubuntu5) UNRELEASED; urgency=low + + * apt-pkg/acquire-item.cc: + - fix file removal on local repo i-m-s hit (LP: #131166) + * tests/local-repo: + - added regression test for this bug + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Aug 2007 12:34:07 +0200 + +apt (0.7.6ubuntu4) gutsy; urgency=low + + * cmdline/apt-get.cc: + - remove YnPrompt when a XS-Vcs- tag is found, improve the + notice (LP: #129575) + * methods/copy.cc: + - take hashes here too + * apt-pkg/acquire-worker.cc: + - only pass on computed hash if we recived one from the method + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Aug 2007 19:30:29 +0200 + +apt (0.7.6ubuntu3) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix packagename extraction when writting apport reports + * apt-pkg/pkgcachegen.cc: + - increase default mmap size (LP: #125640) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Aug 2007 09:52:00 +0200 + +apt (0.7.6ubuntu2) gutsy; urgency=low + + * doc/examples/sources.list: + - change example source to gutsy + * apt-pkg/deb/dpkgpm.cc: + - do not break if no /dev/pts is available + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 06 Aug 2007 15:17:57 +0200 + +apt (0.7.6ubuntu1) gutsy; urgency=low + + [ Michael Vogt ] + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have a file + - send range request with if-range + - delete failed downloads + (thanks to Thom May for his help here) + - delete zero size I-M-S hits + * apt-pkg/deb/dpkgpm.{cc,h}: + - merged dpkg-log branch, this lets you specify a + Dir::Log::Terminal file to log dpkg output to + (ABI break) + - when writting apport reports, attach the dpkg + terminal log too + * merged apt--sha256 branch to fully support the new + sha256 checksums in the Packages and Release files + (ABI break) + * apt-pkg/pkgcachegen.cc: + - increase default mmap size + * tests/local-repo: + - added local repository testcase + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200 + apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong @@ -3567,6 +5414,14 @@ apt (0.7.5) unstable; urgency=low -- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300 +apt (0.7.4ubuntu1) gutsy; urgency=low + + * debian/apt.conf.ubuntu, apt.conf.autoremove: + - Change metapackages to {restricted,universe,multiverse}/metapackages + in Install-Recommends-Sections and Never-MarkAuto-Sections + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Jul 2007 10:42:29 +0200 + apt (0.7.4) unstable; urgency=low [ Michael Vogt ] @@ -3627,6 +5482,90 @@ apt (0.7.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200 +apt (0.7.2ubuntu7) gutsy; urgency=low + + * fix build-dependencies + * fixes in the auto-mark code (thanks to Daniel + Burrows) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200 + +apt (0.7.2ubuntu6) gutsy; urgency=low + + [ Michael Vogt] + * cmdline/apt-get.cc: + - make the XS-Vcs-$foo warning more copy'n'paste + friendly (thanks to Matt Zimmerman) + - ignore the Vcs-Browser tag (Fixes LP: #121770) + * debian/apt.conf.autoremove: + - added "linux-ubuntu-modules" to APT::NeverAutoRemove + + [ Sarah Hobbs ] + * Change metapackages to *metapackages in Install-Recommends-Section + and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that + the Recommends of metapackages in universe and multiverse will get + installed. + * Also make this change in doc/examples/configure-index. + * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, + docbook to fix FTBFS. + * Added in previous changelog entries, as those who uploaded did not + actually commit to Bzr. + + -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000 + +apt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000 + +apt (0.7.2ubuntu3) gutsy; urgency=low + + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200 + +apt (0.7.2ubuntu2) gutsy; urgency=low + + * fixed compile errors with g++ 4.3 (thanks to + Daniel Burrows, closes: #429378) + * fix FTFBFS by changing build-depends to + libcurl4-gnutls-dev (closes: #428363) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200 + +apt (0.7.2ubuntu1) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - apport integration added, this means that a apport + report is written on dpkg failures + * cmdline/apt-get.cc: + - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/ + this will warn when Vcs- headers are found on apt-get source + (Fixes LP:#115959) + * merged from debian/unstable, remaining changes: + - maintainer field changed + - merged the apt--mirror branch + http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/ + - apport reporting on package install/upgrade/remove failure + - support for "Originial-Maintainer" field + - merged apt--xs-vcs-bzr branch + (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/) + - use ubuntu archive keyring by default + - debian/apt.conf.autoremove + + install recommands for section "metapackages" + + do not mark direct dependencies of "metapackages" as autoremoved + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200 + apt (0.7.2-0.1) unstable; urgency=low * Non-maintainer upload. @@ -3749,6 +5688,116 @@ apt (0.7.0) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100 +apt (0.6.46.4ubuntu10) feisty; urgency=low + + * apt-pkg/depcache.cc: + - added "APT::Never-MarkAuto-Section" and consider dependencies + of packages in this section manual (LP#59893) + - ensure proper permissions in the extended_state file (LP#67037) + * debian/apt.conf.ubuntu: + - added APT::Never-MarkAuto-Section "metapackages" (LP#59893) + * cmdline/apt-get.cc: + - "apt-get install foo" on a already installed package foo will + clean the automatic installed flag (LP#72007) + - do not show packages already marked for removal as auto-installed + (LP#64493) + - applied patch to (optionally) hide the auto-remove information + (thanks to Frode M. Døving) (LP#69148) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100 + +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + - only umount if it was mounted by the method before + * cmdline/apt-get.cc: + - fix version output in autoremove list (LP#68941) + * apt-pkg/packagemanager.cc: + - do not spin 100% cpu in FixMissing() (LP#84476) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * doc/examples/configure-index: + - document APT::Acquire::Translation + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100 + +apt (0.6.46.4ubuntu8) feisty; urgency=low + + * fix segfault in the pkgRecords destructor + * Bump ABI version + * debian/control: + - make the libcurl3-gnutls-dev versionized (LP#86614) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100 + +apt (0.6.46.4ubuntu7) feisty; urgency=low + + * Merged the apt--mirror branch. This means that a new 'mirror' + method is available that will allow dynamic mirror updates. + The sources.list entry looks something like this: + "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" + + It also supports error reporting to a configurable url for mirror + problems/failures. + * Bump ABI version + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100 + +apt (0.6.46.4ubuntu6) feisty; urgency=low + + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/algorithms.cc: + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + - fix segfault (lp: #76530) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100 + +apt (0.6.46.4ubuntu5) feisty; urgency=low + + * added apt-transport-https package to provide a optional + https transport (apt-https spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100 + +apt (0.6.46.4ubuntu4) feisty; urgency=low + + * apt-pkg/algorithms.cc: + - only increase the score of installed applications if they + are not obsolete + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100 + +apt (0.6.46.4ubuntu3) feisty; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100 + +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + (thanks to Ian Jackson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100 + +apt (0.6.46.4ubuntu1) feisty; urgency=low + + * merged with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100 + apt (0.6.46.4-0.1) unstable; urgency=emergency * NMU @@ -3778,6 +5827,26 @@ apt (0.6.46.4) unstable; urgency=high -- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100 +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000 + +apt (0.6.46.3ubuntu1) feisty; urgency=low + + * doc/apt-get.8.xml: + - documented autoremove, thanks to Vladimír Lapá%GÄ%@ek + (lp: #62919) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) + * po/en_GB.po: + - typo (lp: #61270) + * add apt-secure.8 to "See also" section + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100 + apt (0.6.46.3-0.2) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. @@ -3890,6 +5959,173 @@ apt (0.6.46) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200 +apt (0.6.45ubuntu14) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200 + +apt (0.6.45ubuntu13) edgy; urgency=low + + * no-changes upload to make apt rebuild against latest g++ and + fix synaptic FTBFS (see bug: #62461 for details) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200 + +apt (0.6.45ubuntu12) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix in the sweep() code, set garbage flag for packages scheduled + for removal too + - do not change the autoFlag in MarkKeep(), this can lead to suprising + side effects + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200 + +apt (0.6.45ubuntu11) edgy; urgency=low + + * removed "installtask" and change it so that tasknames can be given + with "apt-get install taskname^" + * improve the writeStateFile() code + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200 + +apt (0.6.45ubuntu10) edgy; urgency=low + + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) + * methods/gzip.cc: + - don't hang when /var is full (closes: #341537), thanks to + Luis Rodrigo Gallardo Cruz for the patch + * doc/examples/sources.list: + - removed non-us.debian.org from the example (closes: #380030,#316196) + * Merged from Christian Perrier bzr branch: + * ro.po: Updated to 514t. Closes: #388402 + * dz.po: Updated to 514t. Closes: #388184 + * it.po: Fixed typos. Closes: #387812 + * ku.po: New kurdish translation. Closes: #387766 + * sk.po: Updated to 514t. Closes: #386851 + * ja.po: Updated to 514t. Closes: #386537 + * gl.po: Updated to 514t. Closes: #386397 + * fr.po: Updated to 516t. + * fi.po: Updated to 512t. Closes: #382702 + * share/archive-archive.gpg: + - removed the outdated amd64 and debian-2004 keys + * apt-pkg/tagfile.cc: + - applied patch from Jeroen van Wolffelaar to make the tags + caseinsensitive (closes: #384182) + - reverted MMap use in the tagfile because it does not work + across pipes (closes: #383487) + * added "installtask" command + * added new ubuntu specific rewrite rule for "Original-Maintainer" + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200 + +apt (0.6.45ubuntu9) edgy; urgency=low + + * cmdline/apt-get.cc: + - if --no-remove is given, do not run the AutoRemove code + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200 + +apt (0.6.45ubuntu8) edgy; urgency=low + + * apt-pkg/algorithm.cc: + - fix pkgProblemResolver.InstallProtect() to preserve the auto-install + information (lp: #59457) + * cmdline/apt-get.cc: + - fix typo in autoremove information (lp: #59420) + * install apt-mark to modify the automatically install information for + packages + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200 + +apt (0.6.45ubuntu7) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix a bug in the install-recommends-section code + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200 + +apt (0.6.45ubuntu6) edgy; urgency=low + + [Michael Vogt] + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them + * debian/apt.conf.ubuntu: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed + - added "metapackages" as the section we want to install recommends + by default + * apt-pkg/depcache.cc: + - added support to turn install-recommends selectively on/off by + section + [Ian Jackson] + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + * Don't depend on or suggest any particular dpkg or dpkg-dev versions; + --auto-deconfigure is very very old and dpkg-dev's Breaks support + is more or less orthogonal. + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200 + +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200 + +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200 + +apt (0.6.45ubuntu3) edgy; urgency=low + + * ABI break + * merged latest apt--install-recommends (closes: #559000) + * added "--fix-policy" option to can be used as "--fix-broken" and + will install missing weak depends (recommends, and/or suggests + depending on the settings) + * merged the apt--ddtp branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200 + +apt (0.6.45ubuntu2) edgy; urgency=low + + * debian/control: + - switched to libdb4.4 for building (closes: #381019) + * cmdline/apt-get.cc: + - show only the recommends/suggests for the candidate-version, not for all + versions of the package (closes: #257054) + - properly handle recommends/suggests or-groups when printing the list of + suggested/recommends packages (closes: #311619) + * merged "apt--install-recommends" branch: + - added "{no-}install-recommends" commandline option + - added APT::Install-{Recommends,Suggests} option + - currently Install-Recommends defaults to "False" + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200 + +apt (0.6.45ubuntu1) edgy; urgency=low + + * merged with debian/unstable + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200 + apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: @@ -3935,6 +6171,37 @@ apt (0.6.45) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200 +apt (0.6.44.2ubuntu4) edgy; urgency=low + + * Make apt-get dselect-upgrade happy again + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200 + +apt (0.6.44.2ubuntu3) edgy; urgency=low + + * Close extended_states file after writing it. + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100 + +apt (0.6.44.2ubuntu2) edgy; urgency=low + + * create a empty extended_states file if none exists already + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200 + +apt (0.6.44.2ubuntu1) edgy; urgency=low + + * merged with debian/unstable + * merged the "auto-mark" branch to support aptitude like + marking of automatically installed dependencies and added + "apt-get remove --auto-remove" to remove unused auto-installed + packages again + * changed library version from 3.11 to 3.50 to make it clearly + different from the debian version (we are ABI incompatible because + of the auto-mark patch) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200 + apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions @@ -4023,6 +6290,26 @@ apt (0.6.44) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 +apt (0.6.43.3ubuntu3) dapper; urgency=low + + * methods/http.cc: + - fix the user-agent string + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200 + +apt (0.6.43.3ubuntu2) dapper; urgency=low + + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200 + +apt (0.6.43.3ubuntu1) dapper; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in + the status-fd (ubuntu #28954) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@ -4055,6 +6342,38 @@ apt (0.6.43.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 +apt (0.6.43.2ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100 + apt (0.6.43.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: @@ -4078,6 +6397,24 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100 +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: @@ -4101,6 +6438,19 @@ apt (0.6.43.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100 + apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@ -4121,6 +6471,22 @@ apt (0.6.43) unstable; urgency=medium -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 +apt (0.6.42.3ubuntu2) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@ -4227,6 +6593,80 @@ apt (0.6.41) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 +apt (0.6.40.1ubuntu8) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: + - fix for a bad memory/file leak in the mmap code (ubuntu #15603) + * po/de.po, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200 + +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200 + +apt (0.6.40.1ubuntu2) breezy; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200 + apt (0.6.40.1) unstable; urgency=low * bugfix in the parsing code for the apt<->dpkg communication. apt @@ -4236,6 +6676,12 @@ apt (0.6.40.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@ -4251,6 +6697,39 @@ apt (0.6.40) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -4263,6 +6742,13 @@ apt (0.6.39) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700 +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround diff --git a/debian/control b/debian/control index 311346b0f..841a35183 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,24 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team <deity@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.2 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu +Vcs-Browser: http://code.launchpad.net/apt/ubuntu Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg +Pre-Depends: dpkg (>= 1.15.7.2) +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt diff --git a/debian/postinst b/debian/postinst index 1588f5241..eb2a67d0e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -10,6 +10,9 @@ set -e +dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \ + 0.8.16~exp12ubuntu6 -- "$@" + create_apt_conf () { EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list diff --git a/debian/postrm b/debian/postrm index ae1e18d33..bb19d32cc 100755 --- a/debian/postrm +++ b/debian/postrm @@ -12,6 +12,9 @@ set -e #DEBHELPER# +dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \ + 0.8.16~exp12ubuntu6 -- "$@" + case "$1" in remove) ;; diff --git a/debian/preinst b/debian/preinst index 985ad9b84..6ccdfb1a3 100755 --- a/debian/preinst +++ b/debian/preinst @@ -7,6 +7,9 @@ set -e # rm /var/state/apt #fi +dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \ + 0.8.16~exp12ubuntu6 -- "$@" + if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then # upgrading from /var/state/apt using apt. diff --git a/debian/rules b/debian/rules index 9eda3a8fa..dcd4fc361 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. +# build in verbose mode by default to make it easy to diangose issues +export NOISY=1 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -190,6 +193,8 @@ apt: build build-doc # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index cae2b00a0..7530ba382 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -131,7 +131,7 @@ Update the local keyring with the archive keyring and remove from the local keyring the archive keys which are no longer valid. The archive keyring is shipped in the <literal>archive-keyring</literal> package of your - distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian. + distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu. </para> @@ -181,12 +181,12 @@ <listitem><para>Local trust database of archive keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term> - <listitem><para>Keyring of Debian archive trusted keys.</para></listitem> + <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term> + <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term> - <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem> + <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term> + <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem> </varlistentry> </variablelist> diff --git a/doc/examples/sources.list b/doc/examples/sources.list index ef729e203..cc0fd2b8d 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,9 +1,11 @@ # See sources.list(5) for more information, especialy # Remember that you can only use http, ftp or file URIs # CDROMs are managed through the apt-cdrom tool. -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://security.debian.org stable/updates main contrib non-free +deb http://us.archive.ubuntu.com/ubuntu hardy main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy main restricted -# Uncomment if you want the apt-get source function to work -#deb-src http://http.us.debian.org/debian stable main contrib non-free -#deb-src http://security.debian.org stable/updates main contrib non-free +deb http://security.ubuntu.com/ubuntu hardy-security main restricted +deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 364dce12f..fff943e35 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-08 16:54+0300\n" +"POT-Creation-Date: 2011-11-10 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -566,7 +566,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 +#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 msgid "Description" msgstr "" @@ -580,7 +580,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -944,7 +944,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "" @@ -967,7 +967,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -987,12 +987,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "" @@ -1067,14 +1067,14 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: " "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> " "e.g. <literal>APT::Cache::ShowRecommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "" @@ -1091,7 +1091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:452 msgid "<option>-a</option>" msgstr "" @@ -1187,12 +1187,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255 msgid "See Also" msgstr "" @@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1311,12 +1311,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "" @@ -1352,7 +1352,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "" @@ -1397,17 +1397,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "" @@ -1519,7 +1519,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -1580,7 +1580,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530 msgid "<option>-t</option>" msgstr "" @@ -1784,7 +1784,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "" @@ -2242,8 +2242,8 @@ msgid "" "non-free</literal>" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "" @@ -2443,26 +2443,28 @@ msgid "" "Configuration Items: " "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " -"where <literal>Index</literal> can be <literal>Packages</literal>, " -"<literal>Sources</literal> or <literal>Release</literal> and " -"<literal>Checksum</literal> can be <literal>MD5</literal>, " -"<literal>SHA1</literal> or <literal>SHA256</literal>." +"where <literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or " +"<literal>Release</literal> and " +"<literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or " +"<literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:539 +#: apt-ftparchive.1.xml:540 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2471,12 +2473,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:553 +#: apt-ftparchive.1.xml:554 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:555 +#: apt-ftparchive.1.xml:556 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2485,12 +2487,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:562 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:563 +#: apt-ftparchive.1.xml:564 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2500,12 +2502,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:571 +#: apt-ftparchive.1.xml:572 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:573 +#: apt-ftparchive.1.xml:574 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2513,24 +2515,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:577 +#: apt-ftparchive.1.xml:578 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:580 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:583 +#: apt-ftparchive.1.xml:584 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:585 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2539,12 +2541,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:590 +#: apt-ftparchive.1.xml:591 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:592 +#: apt-ftparchive.1.xml:593 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2558,12 +2560,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:602 +#: apt-ftparchive.1.xml:603 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:604 +#: apt-ftparchive.1.xml:605 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2573,12 +2575,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:622 +#: apt-ftparchive.1.xml:623 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2587,14 +2589,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:618 +#: apt-ftparchive.1.xml:619 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:632 +#: apt-ftparchive.1.xml:633 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2625,7 +2627,9 @@ msgid "" "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> " -"<replaceable>target_release</replaceable> </arg> </arg> <group " +"<replaceable>target_release</replaceable> </arg> </arg> <arg> " +"<option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group " "choice=\"req\"> <arg choice='plain'>update</arg> <arg " "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg " @@ -2652,7 +2656,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -2661,12 +2665,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -2681,12 +2685,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -2702,12 +2706,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, " @@ -2718,12 +2722,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -2737,12 +2741,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -2758,7 +2762,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -2769,14 +2773,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more " "already-installed packages without upgrading every package you have on your " @@ -2788,14 +2792,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -2807,12 +2811,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -2822,12 +2826,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -2835,12 +2839,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -2852,7 +2856,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via " "<literal>deb-src</literal> type lines in the &sources-list; file. This means " @@ -2863,16 +2867,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -2882,7 +2887,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -2890,43 +2895,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package nativly. If desired a " +"host-architecture can be specified with the " +"<option>--host-architecture</option> option instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -2938,12 +2946,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -2955,25 +2963,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -2986,48 +2994,48 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 msgid "<option>--install-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3043,17 +3051,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -3065,12 +3073,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with " "<option>--ignore-missing</option> to force APT to use only the .debs it has " @@ -3079,7 +3087,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3091,17 +3099,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: " @@ -3109,7 +3117,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking " "(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be " @@ -3121,7 +3129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -3130,22 +3138,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -3155,68 +3163,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 +msgid "<option>--assume-no</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:437 +msgid "" +"Automatic \"no\" to all prompts. Configuration Item: " +"<literal>APT::Get::Assume-No</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:441 msgid "<option>-u</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:441 msgid "<option>--show-upgraded</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:442 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:447 msgid "<option>-V</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:447 msgid "<option>--verbose-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:448 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:453 +msgid "<option>--host-architecture</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:454 +msgid "" +"This option controls the architecture packages are built for by " +"<command>apt-get source --compile</command> and how cross-builddependencies " +"are satisfied. By default is not set which means that the host architecture " +"is the same as the build architecture (which is defined by " +"<literal>APT::Architecture</literal>) Configuration Item: " +"<literal>APT::Get::Host-Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:462 msgid "<option>-b</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:462 msgid "<option>--compile</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:463 msgid "<option>--build</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:464 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:468 msgid "<option>--ignore-hold</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:469 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -3225,12 +3261,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:475 msgid "<option>--no-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:476 msgid "" "Do not upgrade packages; When used in conjunction with " "<literal>install</literal>, <literal>no-upgrade</literal> will prevent " @@ -3239,12 +3275,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:482 msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:483 msgid "" "Do not install new packages; When used in conjunction with " "<literal>install</literal>, <literal>only-upgrade</literal> will prevent " @@ -3253,12 +3289,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:489 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:490 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3268,12 +3304,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:497 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:498 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3286,12 +3322,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:508 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:509 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be " @@ -3301,24 +3337,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:516 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:517 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:521 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:522 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3329,17 +3365,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:531 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:532 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:533 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3354,12 +3390,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:546 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:548 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where " @@ -3369,24 +3405,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:554 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:555 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:560 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:561 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running " @@ -3395,12 +3431,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:567 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:568 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@ -3412,22 +3448,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:578 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:578 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:578 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:579 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@ -3436,24 +3472,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:584 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:585 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:589 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:590 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@ -3461,14 +3497,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:603 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:612 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " @@ -3476,29 +3512,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:618 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:621 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:622 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:625 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:627 msgid "&apt-author.team;" msgstr "" @@ -3612,38 +3648,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 msgid "net-update" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch " -"from. APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3654,42 +3695,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#: apt-key.8.xml:184 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 -msgid "Keyring of Debian archive trusted keys." +#: apt-key.8.xml:185 +msgid "Keyring of Ubuntu archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +#: apt-key.8.xml:188 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 -msgid "Keyring of Debian archive removed trusted keys." +#: apt-key.8.xml:189 +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -4199,10 +4240,10 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the " +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" @@ -4377,13 +4418,24 @@ msgid "" "compiled for." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -4392,24 +4444,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4418,12 +4470,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4456,12 +4508,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a " @@ -4472,12 +4524,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -4498,63 +4550,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4566,54 +4618,68 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:269 +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is " +"<literal>0</literal> which stands for \"for ever\". Archive specific " +"settings can be made by appending the label of the archive to the option " +"name." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:279 +msgid "Min-ValidTime" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 msgid "" -"Seconds the Release file should be considered valid after it was " -"created. The default is \"for ever\" (0) if the Release file of the archive " -"doesn't include a <literal>Valid-Until</literal> header. If it does then " -"this date is the default. The date from the Release file or the date " -"specified by the creation time of the Release file (<literal>Date</literal> " -"header) plus the seconds specified with this options are used to check if " -"the validation of a file has expired by using the earlier date of the " -"two. Archive specific settings can be made by appending the label of the " -"archive to the option name." +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of competely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " "downloaded at most to patch a file. <literal>SizeLimit</literal> on the " -"other hand is the maximum precentage of the size of all patches compared to " +"other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4623,36 +4689,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:160 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4664,7 +4730,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4678,7 +4744,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4686,7 +4752,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4698,7 +4764,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -4708,7 +4774,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4716,12 +4782,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4731,7 +4797,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4753,12 +4819,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:171 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4778,7 +4844,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4788,7 +4854,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4798,7 +4864,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4808,18 +4874,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:153 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4832,12 +4898,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4845,12 +4911,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4858,7 +4924,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4870,19 +4936,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4899,18 +4965,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " "checked: If this setting exists the method will only be used if this file " -"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder " +"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder " "type=\"literallayout\" id=\"0\"/> Note also that list entries specified on " "the command line will be added at the end of the list specified in the " "configuration files, but before the default entries. To prefer a type in " @@ -4920,20 +4986,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4942,12 +5008,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -4960,13 +5026,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -4989,7 +5055,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -4997,12 +5063,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5014,7 +5080,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5027,7 +5093,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5037,7 +5103,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5045,7 +5111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5057,7 +5123,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5070,7 +5136,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5081,12 +5147,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5094,12 +5160,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5110,50 +5176,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5161,17 +5227,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5180,12 +5246,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5195,7 +5261,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5206,36 +5272,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5250,7 +5316,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5260,7 +5326,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5274,12 +5340,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5291,12 +5357,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5313,12 +5379,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5330,12 +5396,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5345,12 +5411,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5362,12 +5428,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5379,7 +5445,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5393,12 +5459,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5407,12 +5473,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5423,7 +5489,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5431,7 +5497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5439,7 +5505,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5449,110 +5515,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5560,92 +5626,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5655,12 +5721,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5678,90 +5744,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5769,32 +5835,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5865,8 +5931,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or " -"\"<literal>pref</literal>\" as filename extension and which only contain " +"following naming convention: The files have either no or " +"\"<literal>pref</literal>\" as filename extension and only contain " "alphanumeric, hyphen (-), underscore (_) and period (.) characters. " "Otherwise APT will print a notice that it has ignored a file if the file " "doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> " @@ -6198,8 +6264,8 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a " -"glob()-like expression or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." +"glob()-like expression) or contains the word kde (as a POSIX extended " +"regular expression surrounded by slashes)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> @@ -6215,7 +6281,7 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " -"string can occur. Those, the following pin assigns the priority 990 to all " +"string can occur. Thus, the following pin assigns the priority 990 to all " "packages from a release starting with karmic." msgstr "" @@ -6883,7 +6949,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 #, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6929,6 +6995,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>. " +"Multiple settings are separated by spaces. The following settings are " +"supported by APT, note through that unsupported settings will be ignored " +"silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> " +"can be used to specify for which architectures packages information should " +"be downloaded. If this option is not set all architectures defined by the " +"<literal>APT::Architectures</literal> option will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:121 +msgid "" +"<literal>trusted=yes</literal> can be set to indicate that packages from " +"this source are always authenificated even if the " +"<filename>Release</filename> file is not signed or the signature can't be " +"checked. This disables parts of &apt-secure; and should therefore only be " +"used in a local and trusted context. <literal>trusted=no</literal> is the " +"opposite which handles even correctly authenificated sources as not " +"authenificated." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:128 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -6936,12 +7034,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:133 msgid "Some examples:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:135 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6951,17 +7049,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:141 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:146 msgid "file" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:148 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6969,7 +7067,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:155 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media " "swapping. Use the &apt-cdrom; program to create cdrom entries in the source " @@ -6977,7 +7075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:162 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format " @@ -6988,7 +7086,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:173 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual " @@ -7000,12 +7098,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:182 msgid "copy" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:184 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -7013,17 +7111,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:189 msgid "rsh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:189 msgid "ssh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:191 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -7033,12 +7131,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:199 msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:201 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme " @@ -7052,75 +7150,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:143 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:215 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:217 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:219 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:220 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:222 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:223 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:225 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:227 +#, no-wrap +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:230 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:232 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:234 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:236 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:238 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7129,19 +7243,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:242 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:251 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:244 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under " @@ -7153,7 +7267,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:256 msgid "&apt-cache; &apt-conf;" msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 2e0e766a7..6183ae072 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -465,7 +465,7 @@ msgstr "" "<!ENTITY file-preferences \"\n" " <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n" " <listitem><para>Fichier des préférences.\n" -" C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" +" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" " Élément de configuration : <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n" " </varlistentry>\n" @@ -4444,7 +4444,7 @@ msgid "" "also the &apt-preferences; manual page." msgstr "" "Cette option contrôle l'entrée par défaut pour les questions de " -"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 est " +"distribution ; un épinglage (pin) par défaut dont la priorité vaut 990 est " "créée en utilisant la chaîne spécifiée. Le fichier des préférences peut " "annuler cette décision. En clair, cette option permet de contrôler " "simplement dans quelle distribution seront récupérés les paquets. Par " diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 377c41607..b9ced9418 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -126,7 +126,8 @@ class CacheDB Misses += S.Misses; DeLinkBytes += S.DeLinkBytes; }; - Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; + Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), + SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {}; } Stats; bool ReadyDB(std::string const &DB); @@ -142,7 +143,7 @@ class CacheDB bool Clean(); - CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);}; + CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0'; ReadyDB(DB);}; ~CacheDB() {ReadyDB(std::string()); delete DebFile;}; }; diff --git a/methods/ftp.cc b/methods/ftp.cc index ad8a7b828..b1e8d2b0a 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -77,6 +77,7 @@ FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), { Debug = _config->FindB("Debug::Acquire::Ftp",false); PasvAddr = 0; + Buffer[0] = '\0'; } /*}}}*/ // FTPConn::~FTPConn - Destructor /*{{{*/ diff --git a/methods/http.cc b/methods/http.cc index b8ed43cd2..2721b1224 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -716,7 +716,19 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) } } - + // If we ask for uncompressed files servers might respond with content- + // negotation which lets us end up with compressed files we do not support, + // see 657029, 657560 and co, so if we have no extension on the request + // ask for text only. As a sidenote: If there is nothing to negotate servers + // seem to be nice and ignore it. + if (_config->FindB("Acquire::http::SendAccept", true) == true) + { + size_t const filepos = Itm->Uri.find_last_of('/'); + string const file = Itm->Uri.substr(filepos + 1); + if (flExtension(file) == file) + strcat(Buf,"Accept: text/*\r\n"); + } + string Req = Buf; // Check for a partial file diff --git a/methods/http.h b/methods/http.h index c73d4df5c..5c195de64 100644 --- a/methods/http.h +++ b/methods/http.h @@ -117,9 +117,10 @@ struct ServerState bool HeaderLine(std::string Line); bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; - void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0; - Encoding = Closes; time(&Date); ServerFd = -1; - Pipeline = true;}; + void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0; + StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false; + State = Header; Persistent = false; ServerFd = -1; + Pipeline = true;}; /** \brief Result of the header acquire */ enum RunHeadersResult { diff --git a/methods/https.cc b/methods/https.cc index 6de18b8e0..4f2d581d2 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -242,6 +242,19 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // error handling curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); + // If we ask for uncompressed files servers might respond with content- + // negotation which lets us end up with compressed files we do not support, + // see 657029, 657560 and co, so if we have no extension on the request + // ask for text only. As a sidenote: If there is nothing to negotate servers + // seem to be nice and ignore it. + if (_config->FindB("Acquire::https::SendAccept", _config->FindB("Acquire::http::SendAccept", true)) == true) + { + size_t const filepos = Itm->Uri.find_last_of('/'); + string const file = Itm->Uri.substr(filepos + 1); + if (flExtension(file) == file) + headers = curl_slist_append(headers, "Accept: text/*"); + } + // if we have the file send an if-range query with a range header if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) { diff --git a/methods/rsh.cc b/methods/rsh.cc index d249ae961..fb3782314 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -42,7 +42,9 @@ int RSHMethod::FailFd = -1; // --------------------------------------------------------------------- /* */ RSHConn::RSHConn(URI Srv) : Len(0), WriteFd(-1), ReadFd(-1), - ServerName(Srv), Process(-1) {} + ServerName(Srv), Process(-1) { + Buffer[0] = '\0'; +} /*}}}*/ // RSHConn::RSHConn - Destructor /*{{{*/ // --------------------------------------------------------------------- diff --git a/po/apt-all.pot b/po/apt-all.pot index 82d61f4c4..c655eb9a6 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 14:28+0100\n" +"POT-Creation-Date: 2011-11-10 16:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -109,7 +109,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445 #, c-format msgid "Unable to locate package %s" msgstr "" @@ -154,7 +154,7 @@ msgstr "" #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 -#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32 +#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32 #: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -253,7 +253,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271 +#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269 #, c-format msgid "Unable to write to %s" msgstr "" @@ -486,51 +486,63 @@ msgstr "" msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:69 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:99 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:168 methods/rsh.cc:97 +#: ftparchive/multicompress.cc:167 methods/rsh.cc:97 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:193 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:196 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:210 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:233 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:284 +msgid "Failed to create subprocess IPC" +msgstr "" + +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "" + +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "" + +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -642,34 +654,34 @@ msgstr "" msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:632 +#: cmdline/apt-get.cc:633 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:637 +#: cmdline/apt-get.cc:639 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:654 +#: cmdline/apt-get.cc:656 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:674 +#: cmdline/apt-get.cc:676 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:678 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:681 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -677,177 +689,177 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:697 +#: cmdline/apt-get.cc:699 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:709 +#: cmdline/apt-get.cc:711 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:722 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:753 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:794 +#: cmdline/apt-get.cc:783 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:798 +#: cmdline/apt-get.cc:787 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:810 +#: cmdline/apt-get.cc:799 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:815 +#: cmdline/apt-get.cc:804 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:860 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:865 +#: cmdline/apt-get.cc:854 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:896 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:985 +#: cmdline/apt-get.cc:974 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:977 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:980 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:983 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:985 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:1000 +#: cmdline/apt-get.cc:989 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:1003 +#: cmdline/apt-get.cc:992 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1017 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1032 +#: cmdline/apt-get.cc:1021 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1039 +#: cmdline/apt-get.cc:1028 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1030 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211 +#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1080 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1100 +#: cmdline/apt-get.cc:1089 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1100 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1149 +#: cmdline/apt-get.cc:1138 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1145 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1150 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1157 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1162 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534 -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523 +#: cmdline/apt-get.cc:2526 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1190 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237 +#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1219 +#: cmdline/apt-get.cc:1208 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1221 +#: cmdline/apt-get.cc:1210 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -855,46 +867,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246 +#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1242 +#: cmdline/apt-get.cc:1231 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492 +#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1332 +#: cmdline/apt-get.cc:1321 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611 +#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1339 +#: cmdline/apt-get.cc:1328 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1332 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1337 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1338 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1377 +#: cmdline/apt-get.cc:1366 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -904,35 +916,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1370 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1519 +#: cmdline/apt-get.cc:1508 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1551 +#: cmdline/apt-get.cc:1540 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1589 +#: cmdline/apt-get.cc:1578 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1605 +#: cmdline/apt-get.cc:1594 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1657 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1772 +#: cmdline/apt-get.cc:1761 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -948,15 +960,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1779 +#: cmdline/apt-get.cc:1768 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1786 +#: cmdline/apt-get.cc:1775 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -965,7 +977,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1790 +#: cmdline/apt-get.cc:1779 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -973,25 +985,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1792 +#: cmdline/apt-get.cc:1781 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1811 +#: cmdline/apt-get.cc:1800 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1910 +#: cmdline/apt-get.cc:1899 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1914 +#: cmdline/apt-get.cc:1903 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1929 +#: cmdline/apt-get.cc:1918 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -999,222 +1011,222 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1939 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1976 +#: cmdline/apt-get.cc:1965 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2066 +#: cmdline/apt-get.cc:2055 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:2067 +#: cmdline/apt-get.cc:2056 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2098 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:63 +#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:107 +#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2129 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2137 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287 +#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2396 +#: cmdline/apt-get.cc:2385 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2442 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2458 +#: cmdline/apt-get.cc:2447 #, c-format msgid "" "Please use:\n" -"bzr get %s\n" +"bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2511 +#: cmdline/apt-get.cc:2500 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2548 +#: cmdline/apt-get.cc:2537 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2557 +#: cmdline/apt-get.cc:2546 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2562 +#: cmdline/apt-get.cc:2551 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2557 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2595 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2626 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2649 +#: cmdline/apt-get.cc:2638 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2650 +#: cmdline/apt-get.cc:2639 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2672 +#: cmdline/apt-get.cc:2661 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2681 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2700 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2736 +#: cmdline/apt-get.cc:2725 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2753 +#: cmdline/apt-get.cc:2742 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2773 +#: cmdline/apt-get.cc:2762 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2903 +#: cmdline/apt-get.cc:2892 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:2924 +#: cmdline/apt-get.cc:2913 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2947 +#: cmdline/apt-get.cc:2936 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2986 +#: cmdline/apt-get.cc:2975 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2992 +#: cmdline/apt-get.cc:2981 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3015 +#: cmdline/apt-get.cc:3004 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3031 +#: cmdline/apt-get.cc:3020 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3036 +#: cmdline/apt-get.cc:3025 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141 +#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3260 +#: cmdline/apt-get.cc:3252 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3301 +#: cmdline/apt-get.cc:3293 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1260,7 +1272,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3466 +#: cmdline/apt-get.cc:3458 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1568,7 +1580,7 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183 -#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 #: methods/mirror.cc:95 @@ -1600,9 +1612,9 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170 -#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280 -#: apt-pkg/pkgcachegen.cc:1436 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168 +#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278 +#: apt-pkg/pkgcachegen.cc:1434 msgid "Reading package lists" msgstr "" @@ -1719,13 +1731,13 @@ msgid "Read error from %s process" msgstr "" #: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 -#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:491 -#: methods/rred.cc:500 +#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530 +#: methods/rred.cc:539 msgid "Failed to stat" msgstr "" #: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 -#: methods/rred.cc:497 +#: methods/rred.cc:536 msgid "Failed to set modification time" msgstr "" @@ -1813,7 +1825,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197 +#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197 msgid "Read error" msgstr "" @@ -1825,7 +1837,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239 +#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239 msgid "Write error" msgstr "" @@ -1879,7 +1891,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309 +#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309 msgid "Problem hashing file" msgstr "" @@ -2051,15 +2063,19 @@ msgstr "" msgid "Error reading from server" msgstr "" -#: methods/http.cc:1181 +#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293 +msgid "Failed to truncate file" +msgstr "" + +#: methods/http.cc:1191 msgid "Bad header data" msgstr "" -#: methods/http.cc:1198 methods/http.cc:1253 +#: methods/http.cc:1208 methods/http.cc:1263 msgid "Connection failed" msgstr "" -#: methods/http.cc:1345 +#: methods/http.cc:1355 msgid "Internal error" msgstr "" @@ -2067,48 +2083,44 @@ msgstr "" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:109 +#: apt-pkg/contrib/mmap.cc:91 #, c-format msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/contrib/mmap.cc:117 +#: apt-pkg/contrib/mmap.cc:99 #, c-format msgid "Couldn't make mmap of %llu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:144 +#: apt-pkg/contrib/mmap.cc:126 msgid "Unable to close mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200 +#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182 msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:278 +#: apt-pkg/contrib/mmap.cc:260 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:311 -msgid "Failed to truncate file" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:330 +#: apt-pkg/contrib/mmap.cc:312 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:429 +#: apt-pkg/contrib/mmap.cc:411 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:432 +#: apt-pkg/contrib/mmap.cc:414 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2269,121 +2281,113 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:197 +#: apt-pkg/contrib/fileutl.cc:169 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:202 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:220 +#: apt-pkg/contrib/fileutl.cc:192 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:224 +#: apt-pkg/contrib/fileutl.cc:196 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:364 +#: apt-pkg/contrib/fileutl.cc:336 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:391 +#: apt-pkg/contrib/fileutl.cc:363 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:409 +#: apt-pkg/contrib/fileutl.cc:381 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:418 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:719 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:731 +#: apt-pkg/contrib/fileutl.cc:703 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:733 +#: apt-pkg/contrib/fileutl.cc:705 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:737 +#: apt-pkg/contrib/fileutl.cc:709 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:739 +#: apt-pkg/contrib/fileutl.cc:711 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655 +#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:923 +#: apt-pkg/contrib/fileutl.cc:793 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:970 -msgid "Failed to create subprocess IPC" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1019 -msgid "Failed to exec compressor " -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1087 +#: apt-pkg/contrib/fileutl.cc:853 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1152 +#: apt-pkg/contrib/fileutl.cc:886 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1410 +#: apt-pkg/contrib/fileutl.cc:1023 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1414 +#: apt-pkg/contrib/fileutl.cc:1026 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1419 +#: apt-pkg/contrib/fileutl.cc:1031 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1430 +#: apt-pkg/contrib/fileutl.cc:1042 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1450 +#: apt-pkg/contrib/fileutl.cc:1055 msgid "Problem syncing the file" msgstr "" @@ -2468,28 +2472,28 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:131 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:160 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:242 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:248 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2559,7 +2563,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485 +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2714,54 +2718,54 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:85 +#: apt-pkg/pkgcachegen.cc:83 msgid "Cache has an incompatible versioning system" msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 -#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355 -#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390 -#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415 -#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465 -#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510 +#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275 +#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353 +#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388 +#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413 +#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463 +#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:232 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:237 +#: apt-pkg/pkgcachegen.cc:235 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:240 +#: apt-pkg/pkgcachegen.cc:238 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:241 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:515 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1082 +#: apt-pkg/pkgcachegen.cc:1080 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1187 +#: apt-pkg/pkgcachegen.cc:1185 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385 +#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383 msgid "IO Error saving source cache" msgstr "" @@ -2874,177 +2878,177 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:566 +#: apt-pkg/cdrom.cc:528 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672 +#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894 +#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:632 +#: apt-pkg/cdrom.cc:594 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:650 +#: apt-pkg/cdrom.cc:612 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:655 +#: apt-pkg/cdrom.cc:617 msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:664 +#: apt-pkg/cdrom.cc:626 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:645 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:731 +#: apt-pkg/cdrom.cc:687 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:742 +#: apt-pkg/cdrom.cc:698 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:769 +#: apt-pkg/cdrom.cc:725 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:798 +#: apt-pkg/cdrom.cc:754 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:815 +#: apt-pkg/cdrom.cc:771 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:817 +#: apt-pkg/cdrom.cc:773 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:844 +#: apt-pkg/cdrom.cc:800 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:852 +#: apt-pkg/cdrom.cc:808 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873 +#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881 +#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:503 +#: apt-pkg/indexcopy.cc:540 #, c-format msgid "Skipping nonexistent file %s" msgstr "" -#: apt-pkg/indexcopy.cc:509 +#: apt-pkg/indexcopy.cc:546 #, c-format msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/indexcopy.cc:552 #, c-format msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:659 +#: apt-pkg/indexcopy.cc:680 #, c-format msgid "File %s doesn't start with a clearsigned message" msgstr "" #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:690 +#: apt-pkg/indexcopy.cc:711 #, c-format msgid "No keyring installed in %s." msgstr "" -#: apt-pkg/cacheset.cc:352 +#: apt-pkg/cacheset.cc:342 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:355 +#: apt-pkg/cacheset.cc:345 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:466 +#: apt-pkg/cacheset.cc:452 #, c-format msgid "Couldn't find task '%s'" msgstr "" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:459 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:483 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497 +#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:504 +#: apt-pkg/cacheset.cc:496 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:512 +#: apt-pkg/cacheset.cc:504 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:520 +#: apt-pkg/cacheset.cc:512 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3069,115 +3073,115 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:71 +#: apt-pkg/deb/dpkgpm.cc:70 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:866 +#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:873 +#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 +#: apt-pkg/deb/dpkgpm.cc:73 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:74 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:672 +#: apt-pkg/deb/dpkgpm.cc:671 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707 +#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:859 +#: apt-pkg/deb/dpkgpm.cc:858 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:860 +#: apt-pkg/deb/dpkgpm.cc:859 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:865 +#: apt-pkg/deb/dpkgpm.cc:864 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:867 +#: apt-pkg/deb/dpkgpm.cc:866 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:872 +#: apt-pkg/deb/dpkgpm.cc:871 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:874 +#: apt-pkg/deb/dpkgpm.cc:873 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:879 +#: apt-pkg/deb/dpkgpm.cc:878 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:880 +#: apt-pkg/deb/dpkgpm.cc:879 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1111 +#: apt-pkg/deb/dpkgpm.cc:1110 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1141 +#: apt-pkg/deb/dpkgpm.cc:1140 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1320 +#: apt-pkg/deb/dpkgpm.cc:1319 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1377 +#: apt-pkg/deb/dpkgpm.cc:1376 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1382 +#: apt-pkg/deb/dpkgpm.cc:1381 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1384 +#: apt-pkg/deb/dpkgpm.cc:1383 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1390 +#: apt-pkg/deb/dpkgpm.cc:1389 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3189,7 +3193,13 @@ msgid "" "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1403 +#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1430 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3237,14 +3247,14 @@ msgstr "" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:470 +#: methods/rred.cc:509 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:475 +#: methods/rred.cc:514 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -1,16 +1,15 @@ # Danish translation apt. -# Copyright (C) 2010 apt & nedenstående oversættere. +# Copyright (C) 2012 apt & nedenstående oversættere. # This file is distributed under the same license as the apt package. -# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006. -# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006, 2007. -# Joe Hansen <joedalton2@yahoo.dk>, 2010. +# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2003, 2004, 2005, 2006, 2007. +# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 12:05+0200\n" -"PO-Revision-Date: 2010-09-01 23:51+0200\n" +"POT-Creation-Date: 2011-10-14 12:59+0200\n" +"PO-Revision-Date: 2012-02-04 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" "Language: \n" @@ -111,6 +110,7 @@ msgstr "Du skal angive mindst ét søgemønster" #: cmdline/apt-cache.cc:1353 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" +"Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for." #: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 #, c-format @@ -159,13 +159,12 @@ msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompileret på %s %s\n" #: cmdline/apt-cache.cc:1682 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -202,7 +201,6 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Brug: apt-cache [tilvalg] kommando\n" -" apt-cache [tilvalg] add fil1 [fil2 ...]\n" " apt-cache [tilvalg] showpkg pakke1 [pakke2 ...]\n" " apt-cache [tilvalg] showsrc pakke1 [pakke2 ...]\n" "\n" @@ -210,7 +208,6 @@ msgstr "" "binære mellemlagerfiler og hente oplysninger fra dem.\n" "\n" "Kommandoer:\n" -" add - Tilføj en pakkefil til kildemellemlageret\n" " gencaches - Opbyg både pakke- og kildemellemlageret\n" " showpkg - Vis generelle oplysninger om en enkelt pakke\n" " showsrc - Vis kildetekstposter\n" @@ -220,7 +217,6 @@ msgstr "" " unmet - Vis uopfyldte afhængigheder\n" " search - Gennemsøg pakkelisten med et regulært udtryk\n" " show - Vis en læsbar post for pakken\n" -" showauto - Vis en liste af automatisk installerede pakker\n" " depends - Vis de rå afhængighedsoplysninger for en pakke\n" " rdepends - Vis omvendte afhængighedsoplysninger for en pakke\n" " pkgnames - Vis navnene på alle pakker\n" @@ -317,7 +313,7 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -472,7 +468,7 @@ msgstr "Kunne ikke finde %s" msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:452 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markør" @@ -838,7 +834,7 @@ msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" @@ -849,127 +845,127 @@ msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Valgte version '%s' (%s) for '%s'\n" #: cmdline/apt-get.cc:849 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Valgte version '%s' (%s) for '%s'\n" +msgstr "Valgte version '%s' (%s) for '%s' på grund af '%s'\n" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:891 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:969 msgid "Correcting dependencies..." msgstr "Retter afhængigheder..." -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:972 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:975 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:978 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid " Done" msgstr " Færdig" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:984 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'." -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:987 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1012 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1016 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1023 msgid "Install these packages without verification [y/N]? " msgstr "Installér disse pakker uden verifikation (y/N)? " -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1075 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1084 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:1097 +#: cmdline/apt-get.cc:1095 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1133 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1140 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1147 +#: cmdline/apt-get.cc:1145 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1154 +#: cmdline/apt-get.cc:1152 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1157 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 -#: cmdline/apt-get.cc:2502 +#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2517 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1185 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:1205 +#: cmdline/apt-get.cc:1203 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -980,28 +976,28 @@ msgstr "" "For at fortsætte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 +#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:1228 +#: cmdline/apt-get.cc:1226 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:1318 +#: cmdline/apt-get.cc:1316 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:1325 +#: cmdline/apt-get.cc:1323 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1009,19 +1005,19 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1327 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1332 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1333 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1361 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1035,37 +1031,37 @@ msgstr[1] "" "De følgende pakker forsvandt fra dit system, da\n" "alle filer er blevet overskrevet af andre pakker:" -#: cmdline/apt-get.cc:1367 +#: cmdline/apt-get.cc:1365 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vælger '%s' som kildepakke fremfor '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1575 +#: cmdline/apt-get.cc:1573 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorer utilgængelig version '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1589 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1652 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1756 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1083,15 +1079,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1763 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover ødelagde noget" -#: cmdline/apt-get.cc:1762 +#: cmdline/apt-get.cc:1770 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1102,7 +1098,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker blev installeret automatisk, og behøves ikke længere:" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1774 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1111,19 +1107,19 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n" msgstr[1] "" "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1776 msgid "Use 'apt-get autoremove' to remove them." msgstr "Brug 'apt-get autoremove' til at fjerne dem." -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1795 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1894 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1898 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1131,7 +1127,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1914 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1142,73 +1138,75 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1932 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1958 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2048 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2049 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2091 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s sat til automatisk installation.\n" -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark " +"manual« i stedet for." -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2122 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2130 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2320 #, c-format msgid "Downloading %s %s" -msgstr "" +msgstr "Henter %s %s" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2376 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 +#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2433 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1217,7 +1215,7 @@ msgstr "" "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n" "%s\n" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2438 #, c-format msgid "" "Please use:\n" @@ -1228,149 +1226,151 @@ msgstr "" "bzr get %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2491 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2528 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2527 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2548 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:2586 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2602 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2629 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2630 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2652 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2672 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2676 +#: cmdline/apt-get.cc:2691 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:2701 +#: cmdline/apt-get.cc:2716 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" +"Architectures for opsætning" -#: cmdline/apt-get.cc:2718 +#: cmdline/apt-get.cc:2733 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2753 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:2868 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2883 +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" +"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2904 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" +"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2912 +#: cmdline/apt-get.cc:2927 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2951 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2966 +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige " -"udgaver af pakken %s kan tilfredsstille versions-kravene" +"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " +"kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:2957 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2972 +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" +"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " +"kandidatversion" -#: cmdline/apt-get.cc:2980 +#: cmdline/apt-get.cc:2995 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:2996 +#: cmdline/apt-get.cc:3011 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:3001 +#: cmdline/apt-get.cc:3016 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 -#, fuzzy, c-format +#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121 +#, c-format msgid "Changelog for %s (%s)" -msgstr "Forbinder til %s (%s)" +msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:3225 +#: cmdline/apt-get.cc:3240 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:3266 -#, fuzzy +#: cmdline/apt-get.cc:3281 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1426,9 +1426,9 @@ msgstr "" "Kommandoer:\n" " update - Hent nye lister over pakker\n" " upgrade - Udfør en opgradering\n" -" install - Installér nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Afinstallér pakker\n" -" autoremove - Afinstallér automatisk alle ubrugte pakker\n" +" install - Installer nye pakker (pakke er libc6, ikke libc6.deb)\n" +" remove - Afinstaller pakker\n" +" autoremove - Afinstaller automatisk alle ubrugte pakker\n" " purge - Fjern pakker og konfigurationsfiler\n" " source - Hent kildetekstarkiver\n" " build-dep - Sæt opbygningsafhængigheder op for kildetekstpakker\n" @@ -1437,8 +1437,8 @@ msgstr "" " clean - Slet hentede arkivfiler\n" " autoclean - Slet gamle hentede arkivfiler\n" " check - Tjek at der ikke er uopfyldte afhængigheder\n" -" markauto - Marker de angivne pakker som automatisk installeret\n" -" unmarkauto - Marker de angivne pakker som manuelt installeret\n" +" changelog - Hent og vis ændringsloggen for den angivne pakke\n" +" download - Hent den binære pakke til den aktuelle mappe\n" "\n" "Tilvalg:\n" " -h Denne hjælpetekst.\n" @@ -1456,9 +1456,9 @@ msgstr "" " -o=? Angiv et arbitrært opsætningsvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-get(8), sources.list(5) og apt.conf(5)\n" "for flere oplysninger og tilvalg.\n" -" Denne APT har \"Super Cow Powers\".\n" +" Denne APT har »Super Cow Powers«.\n" -#: cmdline/apt-get.cc:3429 +#: cmdline/apt-get.cc:3444 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1508,43 +1508,43 @@ msgstr "" "i drevet '%s' og tryk retur\n" #: cmdline/apt-mark.cc:46 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "men den er ikke installeret" +msgstr "%s kan ikke markeres, da den ikke er installeret.\n" #: cmdline/apt-mark.cc:52 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s sat til manuelt installeret.\n" +msgstr "%s var allerede sat til manuelt installeret.\n" #: cmdline/apt-mark.cc:54 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s sat til automatisk installation.\n" +msgstr "%s var allerede sat til automatisk installeret.\n" #: cmdline/apt-mark.cc:169 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s er i forvejen den nyeste version.\n" +msgstr "%s var allerede sat i bero.\n" #: cmdline/apt-mark.cc:171 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s er i forvejen den nyeste version.\n" +msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s sat til manuelt installeret.\n" +msgstr "%s sat i bero.\n" #: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Kunne ikke åbne %s" +msgstr "Afbrød i bero for %s.\n" #: cmdline/apt-mark.cc:220 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?" #: cmdline/apt-mark.cc:268 msgid "" @@ -1567,6 +1567,26 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" +"Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n" +"\n" +"apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n" +"som manuelt eller automatisk installeret. Programmet kan også vise\n" +"markeringerne.\n" +"\n" +"Kommandoer:\n" +" auto - Marker de givne pakker som automatisk installeret\n" +" manual - Marker de givne pakker som manuelt installeret\n" +"\n" +"Tilvalg:\n" +" -h Denne hjælpetekst.\n" +" -q Logbar uddata - ingen statusindikator\n" +" -qq Ingen uddata undtagen for fejl\n" +" -s Ingen handling. Viser kun hvad der ville blive udført.\n" +" -f læs/skriv auto/manuel markering i den givne fil\n" +" -c=? Læs denne konfigurationsfil\n" +" -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/" +"tmp\n" +"Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1773,8 +1793,8 @@ msgstr "File %s/%s overskriver filen i pakken %s" #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353 #: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" @@ -1804,9 +1824,9 @@ msgstr "Kunne ikke finde %sinfo" msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 -#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 -#: apt-pkg/pkgcachegen.cc:1320 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063 +#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173 +#: apt-pkg/pkgcachegen.cc:1335 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" @@ -1915,7 +1935,7 @@ msgstr "Ikke-tolkbar kontrolfil" #: methods/bzip2.cc:60 methods/gzip.cc:52 msgid "Empty files can't be valid archives" -msgstr "" +msgstr "Tomme filer kan ikke være gyldige arkiver" #: methods/bzip2.cc:64 #, c-format @@ -1928,22 +1948,22 @@ msgid "Read error from %s process" msgstr "Læsefejl fra %s-process" #: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527 +#: methods/rred.cc:536 msgid "Failed to stat" msgstr "Kunne ikke finde" #: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/rred.cc:533 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" -#: methods/cdrom.cc:199 +#: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kunne ikke læse cdrom-databasen %s" -#: methods/cdrom.cc:208 +#: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1951,20 +1971,20 @@ msgstr "" "Brug apt-cdrom for at apt kan lære den at kende. apt-get update kan ikke " "bruges til at tilføje nye cd'er" -#: methods/cdrom.cc:218 +#: methods/cdrom.cc:219 msgid "Wrong CD-ROM" msgstr "Forkert cd" -#: methods/cdrom.cc:245 +#: methods/cdrom.cc:246 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:251 msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "Fil blev ikke fundet" @@ -1973,34 +1993,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI, lokale URI'er må ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:168 +#: methods/ftp.cc:169 msgid "Logging in" msgstr "Logget på" -#: methods/ftp.cc:174 +#: methods/ftp.cc:175 msgid "Unable to determine the peer name" msgstr "Kunne ikke bestemme serverens navn" -#: methods/ftp.cc:179 +#: methods/ftp.cc:180 msgid "Unable to determine the local name" msgstr "Kunne ikke bestemme det lokale navn" -#: methods/ftp.cc:210 methods/ftp.cc:238 +#: methods/ftp.cc:211 methods/ftp.cc:239 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serveren nægtede os forbindelse og sagde: %s" -#: methods/ftp.cc:216 +#: methods/ftp.cc:217 #, c-format msgid "USER failed, server said: %s" msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:223 +#: methods/ftp.cc:224 #, c-format msgid "PASS failed, server said: %s" msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:243 +#: methods/ftp.cc:244 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -2008,114 +2028,114 @@ msgstr "" "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::" "ProxyLogin er tom." -#: methods/ftp.cc:271 +#: methods/ftp.cc:272 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:297 +#: methods/ftp.cc:298 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 +#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" -#: methods/ftp.cc:341 +#: methods/ftp.cc:342 msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 +#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191 msgid "Read error" msgstr "Læsefejl" -#: methods/ftp.cc:351 methods/rsh.cc:198 +#: methods/ftp.cc:352 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "Mellemlageret blev overfyldt af et svar." -#: methods/ftp.cc:368 methods/ftp.cc:380 +#: methods/ftp.cc:369 methods/ftp.cc:381 msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 +#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 msgid "Write error" msgstr "Skrivefejl" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Kunne ikke oprette sokkel" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Kunne ikke forbinde passiv sokkel." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunne ikke få en lyttesokkel" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Kunne ikke tilknytte en sokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Kunne ikke lytte på soklen" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Kunne ikke finde soklens navn" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Kunne ikke sende PORT-kommando" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukendt adressefamilie %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Tidsudløb på datasokkel-forbindelse" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde '%s'" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Forespørgsel" -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Kunne ikke udføre " @@ -2356,7 +2376,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1138 +#: apt-pkg/contrib/strutl.cc:1137 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@ -2431,43 +2451,43 @@ msgstr "%c%s... Færdig" msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke." -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109 +#: apt-pkg/contrib/cmndline.cc:117 #, c-format msgid "Command line option %s is not understood" msgstr "Kommandolinjetilvalget %s blev ikke forstået" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjetilvalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Tilvalget %s kræver et parameter." -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>." -#: apt-pkg/contrib/cmndline.cc:236 +#: apt-pkg/contrib/cmndline.cc:232 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tilvalget %s kræver et heltalligt parameter, ikke '%s'" -#: apt-pkg/contrib/cmndline.cc:267 +#: apt-pkg/contrib/cmndline.cc:263 #, c-format msgid "Option '%s' is too long" msgstr "Tilvalget '%s' er for langt" -#: apt-pkg/contrib/cmndline.cc:300 +#: apt-pkg/contrib/cmndline.cc:295 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s blev ikke forstået, prøv med 'true' eller 'false'." -#: apt-pkg/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:345 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig handling %s" @@ -2478,7 +2498,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 +#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39 #: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" @@ -2511,90 +2531,90 @@ msgstr "Kunne ikke opnå låsen %s" #: apt-pkg/contrib/fileutl.cc:335 #, c-format msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" #: apt-pkg/contrib/fileutl.cc:362 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" #: apt-pkg/contrib/fileutl.cc:380 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" #: apt-pkg/contrib/fileutl.cc:389 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:690 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:691 +#: apt-pkg/contrib/fileutl.cc:702 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:693 +#: apt-pkg/contrib/fileutl.cc:704 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en signal %u." -#: apt-pkg/contrib/fileutl.cc:697 +#: apt-pkg/contrib/fileutl.cc:708 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:699 +#: apt-pkg/contrib/fileutl.cc:710 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 +#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/contrib/fileutl.cc:781 +#: apt-pkg/contrib/fileutl.cc:792 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:852 #, c-format msgid "read, still have %lu to read but none left" msgstr "læs, mangler stadig at læse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:874 +#: apt-pkg/contrib/fileutl.cc:885 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1010 +#: apt-pkg/contrib/fileutl.cc:1021 #, c-format msgid "Problem closing the gzip file %s" msgstr "Problem under lukning af gzip-filen %s" -#: apt-pkg/contrib/fileutl.cc:1013 +#: apt-pkg/contrib/fileutl.cc:1024 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1018 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1029 +#: apt-pkg/contrib/fileutl.cc:1040 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1053 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2781,7 +2801,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2836,13 +2856,12 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 -#, fuzzy +#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " +"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle " "bruges i stedet." #: apt-pkg/acquire.cc:79 @@ -2862,12 +2881,12 @@ msgstr "Kunne ikke låse mappen %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:857 +#: apt-pkg/acquire.cc:861 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:863 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li ud af %li" @@ -2887,12 +2906,12 @@ msgstr "Metoden %s startede ikke korrekt" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:147 +#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" -#: apt-pkg/init.cc:163 +#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2917,24 +2936,26 @@ msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'" msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." -#: apt-pkg/policy.cc:71 +#: apt-pkg/policy.cc:72 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke " +"er tilgængelig i kilderne" -#: apt-pkg/policy.cc:389 +#: apt-pkg/policy.cc:390 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler" -#: apt-pkg/policy.cc:411 +#: apt-pkg/policy.cc:412 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forstå pin-type %s" -#: apt-pkg/policy.cc:419 +#: apt-pkg/policy.cc:420 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" @@ -2942,90 +2963,90 @@ msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" -#: apt-pkg/pkgcachegen.cc:187 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:204 +#: apt-pkg/pkgcachegen.cc:207 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:242 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:274 +#: apt-pkg/pkgcachegen.cc:277 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:278 +#: apt-pkg/pkgcachegen.cc:281 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 -#: apt-pkg/pkgcachegen.cc:313 +#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308 +#: apt-pkg/pkgcachegen.cc:316 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion%d)" -#: apt-pkg/pkgcachegen.cc:309 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:342 +#: apt-pkg/pkgcachegen.cc:345 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)" -#: apt-pkg/pkgcachegen.cc:348 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:351 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:354 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:357 +#: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:386 +#: apt-pkg/pkgcachegen.cc:389 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:400 +#: apt-pkg/pkgcachegen.cc:403 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" -#: apt-pkg/pkgcachegen.cc:406 +#: apt-pkg/pkgcachegen.cc:409 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:960 +#: apt-pkg/pkgcachegen.cc:975 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:1065 +#: apt-pkg/pkgcachegen.cc:1080 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 +#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@ -3038,41 +3059,45 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 -#: apt-pkg/acquire-item.cc:1991 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1990 msgid "Hash Sum mismatch" msgstr "Hashsum stemmer ikke" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:1387 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" +"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" +"punkt eller forkert udformet fil)" #: apt-pkg/acquire-item.cc:1403 -#, fuzzy, c-format +#, c-format msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Kunne ikke fortolke udgivelsesfil %s" +msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1438 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " +"arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1498 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1531 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3082,12 +3107,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1639 +#: apt-pkg/acquire-item.cc:1638 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3096,7 +3121,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1698 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3105,13 +3130,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1752 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1840 +#: apt-pkg/acquire-item.cc:1839 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@ -3135,7 +3160,7 @@ msgstr "Intet hashpunkt i udgivelsesfil %s" msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:129 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s" @@ -3235,22 +3260,22 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" @@ -3273,7 +3298,7 @@ msgstr "Hashsum stemmer ikke: %s" #: apt-pkg/indexcopy.cc:677 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Fil %s starter ikke med en »clearsigned« besked" #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:708 @@ -3413,25 +3438,25 @@ msgstr "Gør klar til at fjerne %s helt" msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1082 +#: apt-pkg/deb/dpkgpm.cc:1087 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n" -#: apt-pkg/deb/dpkgpm.cc:1113 +#: apt-pkg/deb/dpkgpm.cc:1118 msgid "Running dpkg" msgstr "Kører dpkg" -#: apt-pkg/deb/dpkgpm.cc:1338 +#: apt-pkg/deb/dpkgpm.cc:1344 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1343 +#: apt-pkg/deb/dpkgpm.cc:1349 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1345 +#: apt-pkg/deb/dpkgpm.cc:1351 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3439,14 +3464,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1357 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1357 +#: apt-pkg/deb/dpkgpm.cc:1363 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3454,7 +3479,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1364 +#: apt-pkg/deb/dpkgpm.cc:1370 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" @@ -3489,21 +3514,21 @@ msgstr "Ikke låst" #: methods/mirror.cc:260 #, c-format msgid "No mirror file '%s' found " -msgstr "Ingen spejlfil '%s' fundet " +msgstr "Ingen spejlfil »%s« fundet " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Ingen spejlfil '%s' fundet " +msgstr "Kan ikke læse spejlfil »%s«" #: methods/mirror.cc:422 #, c-format msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rred.cc:503 +#: methods/rred.cc:506 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -3512,7 +3537,7 @@ msgstr "" "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - " "fejlrettelsen ser ud til at være ødelagt." -#: methods/rred.cc:508 +#: methods/rred.cc:511 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -3524,12 +3549,3 @@ msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" - -#~ msgid "Internal error, could not locate member" -#~ msgstr "Intern fejl, kunne ikke finde element" - -#~ msgid "Internal error, group '%s' has no installable pseudo package" -#~ msgstr "Intern fejl, gruppe '%s' har ingen installationsbar pseudopakke" - -#~ msgid "Release file expired, ignoring %s (invalid since %s)" -#~ msgstr "Udgivelsesfil udløbet, ignorerer %s (ugyldig siden %s)" @@ -3018,7 +3018,7 @@ msgstr "MD5Sum ei täsmää" #: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 #: apt-pkg/acquire-item.cc:1991 msgid "Hash Sum mismatch" -msgstr "Hash Sum täsmää" +msgstr "Tarkistussumma ei täsmää" #: apt-pkg/acquire-item.cc:1388 #, c-format @@ -3244,7 +3244,7 @@ msgstr "" #: apt-pkg/indexcopy.cc:549 #, fuzzy, c-format msgid "Hash mismatch for: %s" -msgstr "Hash Sum täsmää" +msgstr "Kohteen %s tarkistussumma ei täsmää" #: apt-pkg/indexcopy.cc:677 #, c-format @@ -127,7 +127,7 @@ msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1499 msgid "Pinned packages:" -msgstr "Paquets étiquetés :" +msgstr "Paquets épinglés :" #: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" @@ -147,7 +147,7 @@ msgstr "(aucun)" #: cmdline/apt-cache.cc:1553 msgid " Package pin: " -msgstr " Étiquette de paquet : " +msgstr " Épinglage de paquet : " #. Show the priority tables #: cmdline/apt-cache.cc:1562 @@ -220,7 +220,7 @@ msgstr "" " pkgnames - Liste le nom de tous les paquets du système\n" " dotty - Génère un graphe des paquets pour GraphViz\n" " xvcg - Génère un graphe des paquets pour xvcg\n" -" policy - Affiche l'étiquetage (Pin) en vigueur\n" +" policy - Affiche l'épinglage (Pin) en vigueur\n" "\n" "Options :\n" " -h Ce texte d'aide\n" @@ -3020,11 +3020,11 @@ msgstr "" #: apt-pkg/policy.cc:411 #, c-format msgid "Did not understand pin type %s" -msgstr "Étiquette %s inconnue" +msgstr "Type d'épinglage %s inconnu" #: apt-pkg/policy.cc:419 msgid "No priority (or zero) specified for pin" -msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" +msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage" #: apt-pkg/pkgcachegen.cc:80 msgid "Cache has an incompatible versioning system" diff --git a/po/makefile b/po/makefile index 43ca12fe3..81dd362a2 100644 --- a/po/makefile +++ b/po/makefile @@ -65,7 +65,11 @@ $(PACKAGE)-all.pot: $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot printf "%s " "Generating $@" echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d - $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ + # thanks powerpc for segfaulting in msgmerge in the first run + # (but not the second) - the part "||.." should get removed + # once powerpc is a bit more stable + $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ || \ + $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo" @@ -1,23 +1,27 @@ # Advanced Package Transfer - APT message translation catalog # Polish translation by: -# Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004. -# Bartosz Fenski <fenio@debian.org>, 2005, 2006 -# Wiktor Wandachowicz <siryes@gmail.com>, 2008, 2009 # # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: # http://wiki.debian.org/PolishL10N/PackageInstallers +# Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004. +# Bartosz Fenski <fenio@debian.org>, 2005, 2006. +# Wiktor Wandachowicz <siryes@gmail.com>, 2008, 2009. +# Michał Kułach <michal.kulach@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 12:05+0200\n" -"PO-Revision-Date: 2009-09-27 03:42+0100\n" -"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" +"POT-Creation-Date: 2011-10-14 12:59+0200\n" +"PO-Revision-Date: 2012-01-22 20:35+0100\n" +"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" #: cmdline/apt-cache.cc:154 #, c-format @@ -29,9 +33,8 @@ msgid "Total package names: " msgstr "Liczba nazw pakietów: " #: cmdline/apt-cache.cc:284 -#, fuzzy msgid "Total package structures: " -msgstr "Liczba nazw pakietów: " +msgstr "Liczba wszystkich typów pakietów: " #: cmdline/apt-cache.cc:324 msgid " Normal packages: " @@ -105,13 +108,12 @@ msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" #: cmdline/apt-cache.cc:1218 -#, fuzzy msgid "You must give at least one search pattern" -msgstr "Należy podać dokładnie jeden wzorzec" +msgstr "Należy podać przynajmniej jeden wzorzec" #: cmdline/apt-cache.cc:1353 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"." #: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 #, c-format @@ -135,7 +137,7 @@ msgstr "Przypięte pakiety:" #: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" -msgstr "(nieznaleziony)" +msgstr "(nie znaleziono)" #: cmdline/apt-cache.cc:1519 msgid " Installed: " @@ -160,13 +162,12 @@ msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" #: cmdline/apt-cache.cc:1682 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -203,16 +204,13 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Użycie: apt-cache [opcje] polecenie\n" -" apt-cache [opcje] add plik1 [plik2 ...]\n" " apt-cache [opcje] showpkg pakiet1 [pakiet2 ...]\n" " apt-cache [opcje] showsrc pakiet1 [pakiet2 ...]\n" "\n" -"apt-cache to niskopoziomowe narzędzie służące do manipulowania\n" -"binarnymi plikami magazynów podręcznych APT-a, oraz do pobierania\n" -"z nich informacji.\n" +"apt-cache to niskopoziomowe narzędzie służące pobierania informacji\n" +"z podręcznego magazynu plików binarnych APT-a.\n" "\n" "Polecenia:\n" -" add - Dodaje plik pakietów do magazynu podręcznego\n" " gencaches - Buduje magazyn podręczny pakietów i źródeł\n" " showpkg - Pokazuje ogólne informacje na temat pojedynczego pakietu\n" " showsrc - Pokazuje informacje dla źródeł\n" @@ -241,18 +239,17 @@ msgstr "" "oraz apt.conf(5).\n" #: cmdline/apt-cdrom.cc:77 -#, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 2.1r1 Disk 1\"" +msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\"" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" #: cmdline/apt-cdrom.cc:127 -#, fuzzy, c-format +#, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Nie udało się zmienić nazwy %s na %s" +msgstr "Nie udało się zamontować \"%s\" w \"%s\"" #: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." @@ -319,7 +316,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -455,13 +452,12 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzała, próbuję zaktualizować %s" #: ftparchive/cachedb.cc:72 -#, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -"Niepoprawny format bazy. Jeśli została zaktualizowana starsza wersja apt, " -"proszę usunąć i utworzyć ponownie bazę danych." +"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę " +"usunąć i utworzyć ponownie bazę danych." #: ftparchive/cachedb.cc:77 #, c-format @@ -478,7 +474,7 @@ msgstr "Nie udało się wykonać operacji stat na %s" msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:452 msgid "Unable to get a cursor" msgstr "Nie udało się pobrać kursora" @@ -579,17 +575,17 @@ msgstr "Nie można otworzyć %s" #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Błędna linia %2$lu #1 pliku override %1$s" +msgstr "Nieprawidłowa linia %2$lu #1 pliku override %1$s" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Błędna linia %2$lu #2 pliku override %1$s" +msgstr "Nieprawidłowa linia %2$lu #2 pliku override %1$s" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Błędna linia %2$lu #3 pliku override %1$s" +msgstr "Nieprawidłowa linia %2$lu #3 pliku override %1$s" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format @@ -735,7 +731,7 @@ msgid "" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" -"Nie powinno się tego robić, chyba że dokładnie wiesz co robisz!" +"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" #: cmdline/apt-get.cc:594 #, c-format @@ -745,7 +741,7 @@ msgstr "%lu aktualizowanych, %lu nowo instalowanych, " #: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " -msgstr "%lu przeinstalowywanych, " +msgstr "%lu ponownie instalowanych, " #: cmdline/apt-get.cc:600 #, c-format @@ -763,14 +759,14 @@ msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #: cmdline/apt-get.cc:628 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for task '%s'\n" -msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" +msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n" #: cmdline/apt-get.cc:634 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" +msgstr "Uwaga, wybieranie %s dla wyrażenia \"%s\"\n" #: cmdline/apt-get.cc:651 #, c-format @@ -782,9 +778,8 @@ msgid " [Installed]" msgstr " [Zainstalowany]" #: cmdline/apt-get.cc:671 -#, fuzzy msgid " [Not candidate version]" -msgstr "Kandydujące wersje" +msgstr " [Brak wersji kandydującej]" #: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." @@ -806,19 +801,19 @@ msgid "However the following packages replace it:" msgstr "Jednak następujące pakiety go zastępują:" #: cmdline/apt-get.cc:706 -#, fuzzy, c-format +#, c-format msgid "Package '%s' has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" #: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" +msgstr "Pakiety wirtualne, takie jak \"%s\" nie mogą być usunięte\n" #: cmdline/apt-get.cc:748 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Uwaga, wybieranie %s zamiast %s\n" +msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n" #: cmdline/apt-get.cc:778 #, c-format @@ -827,10 +822,10 @@ msgstr "" "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" #: cmdline/apt-get.cc:782 -#, fuzzy, c-format +#, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" +"Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n" #: cmdline/apt-get.cc:794 #, c-format @@ -843,192 +838,193 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" #: cmdline/apt-get.cc:844 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "Wybrano wersję %s (%s) dla %s\n" +msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n" #: cmdline/apt-get.cc:849 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Wybrano wersję %s (%s) dla %s\n" +msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:891 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:969 msgid "Correcting dependencies..." msgstr "Naprawianie zależności..." -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:972 msgid " failed." msgstr " nie udało się." -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:975 msgid "Unable to correct dependencies" msgstr "Nie udało się naprawić zależności" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:978 msgid "Unable to minimize the upgrade set" msgstr "Nie udało się zminimalizować zbioru aktualizacji" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:984 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:987 msgid "Unmet dependencies. Try using -f." msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1012 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1016 msgid "Authentication warning overridden.\n" -msgstr "Ostrzeżenie uwierzytelniania zignorowano.\n" +msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1023 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195 msgid "There are problems and -y was used without --force-yes" -msgstr "Były problemy, a użyto -y bez --force-yes" +msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1075 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Błąd wewnętrzny, InstallPackages użyto z uszkodzonymi pakietami!" +msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1084 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." -#: cmdline/apt-get.cc:1097 +#: cmdline/apt-get.cc:1095 msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1133 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Dziwne. Rozmiary się nie zgadzają, proszę to zgłosić pod apt@packages.debian." -"org" +"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " +"apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1140 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1147 +#: cmdline/apt-get.cc:1145 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1154 +#: cmdline/apt-get.cc:1152 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1157 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 -#: cmdline/apt-get.cc:2502 +#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2517 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1185 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Nakazano wykonywać tylko trywialne operacje, a to nie jest trywialne." +msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." -#: cmdline/apt-get.cc:1205 +# Bezpieczniej jest nie używać tu polskich znaków. +#: cmdline/apt-get.cc:1203 msgid "Yes, do as I say!" -msgstr "Tak, rób jak mówię!" +msgstr "Tak, jestem pewien!" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 #, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Zaraz zrobisz coś potencjalnie szkodliwego.\n" -"Aby kontynuować wpisz zdanie \"%s\"\n" +"Zaraz stanie się coś potencjalnie szkodliwego.\n" +"Aby kontynuować proszę napisać zdanie \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 +#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:1228 +#: cmdline/apt-get.cc:1226 msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: cmdline/apt-get.cc:1318 +#: cmdline/apt-get.cc:1316 msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:1325 +#: cmdline/apt-get.cc:1323 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " -"update lub użyć opcji --fix-missing" +"update lub użyć opcji --fix-missing." -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1327 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1332 msgid "Unable to correct missing packages." msgstr "Nie udało się poprawić brakujących pakietów." -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1333 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1361 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1036,37 +1032,44 @@ msgid_plural "" "The following packages disappeared from your system as\n" "all files have been overwritten by other packages:" msgstr[0] "" +"Następujący pakiet zniknął z tego systemu, ponieważ wszystkie jego pliki " +"zostały nadpisane przez inne pakiety:" msgstr[1] "" +"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " +"zostały nadpisane przez inne pakiety:" +msgstr[2] "" +"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " +"zostały nadpisane przez inne pakiety:" -#: cmdline/apt-get.cc:1367 +#: cmdline/apt-get.cc:1365 msgid "Note: This is done automatic and on purpose by dpkg." -msgstr "" +msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgstr "Ignorowanie niedostępnego wydania docelowego %s pakietu %s" -#: cmdline/apt-get.cc:1537 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1535 +#, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" +msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1575 +#: cmdline/apt-get.cc:1573 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" +msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1589 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1652 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1756 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1084,61 +1087,67 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1763 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł" +msgstr "Błąd wewnętrzny spowodowany przez AutoRemover" -#: cmdline/apt-get.cc:1762 -#, fuzzy +#: cmdline/apt-get.cc:1770 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" +"Następujący pakiet został zainstalowany automatycznie i nie jest już więcej " +"wymagany:" +msgstr[1] "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -msgstr[1] "" +msgstr[2] "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1766 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1774 +#, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "" -"%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " -"wymagane.\n" +"%lu pakiet został zainstalowany automatycznie i nie jest już więcej " +"wymagany.\n" msgstr[1] "" -"%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " +"%lu pakiety zostały zainstalowane automatycznie i nie są już więcej " +"wymagane.\n" +msgstr[2] "" +"%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1776 msgid "Use 'apt-get autoremove' to remove them." msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1795 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło" +msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1894 msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" +msgstr "" +"Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1898 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez " +"Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1914 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1146,183 +1155,194 @@ msgid "" "or been moved out of Incoming." msgstr "" "Nie udało się zainstalować niektórych pakietów. Może to oznaczać,\n" -"że zażądano niemożliwej sytuacji lub używasz dystrybucji niestabilnej,\n" +"że zażądano niemożliwej sytuacji lub użyto dystrybucji niestabilnej,\n" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1932 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1958 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2048 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2049 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2091 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61 +#, c-format msgid "%s set to automatically installed.\n" -msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" +msgstr "%s zaznaczony jako zainstalowany automatycznie.\n" -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-" +"mark manual\"." -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2122 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2130 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205 msgid "Internal error, problem resolver broke stuff" -msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło" +msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2320 #, c-format msgid "Downloading %s %s" -msgstr "" +msgstr "Pobieranie %s %s" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2376 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 +#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2433 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" +"UWAGA: pakietowanie \"%s\" jest zarządzane w systemie kontroli wersji \"%s\" " +"pod adresem:\n" +"%s\n" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2438 #, c-format msgid "" "Please use:\n" "bzr get %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" +"Proszę użyć:\n" +"bzr get %s\n" +"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " +"pakietu.\n" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2491 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2528 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2527 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2548 #, c-format msgid "Fetch source %s\n" -msgstr "Pobierz źródło %s\n" +msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:2586 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2602 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2629 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2630 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2652 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2672 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2676 +#: cmdline/apt-get.cc:2691 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:2701 +#: cmdline/apt-get.cc:2716 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." +"conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2718 +#: cmdline/apt-get.cc:2733 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2753 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:2868 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2883 +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " -"pakietu %s" +"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " +"w pakietach \"%s\"" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2904 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1331,56 +1351,55 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2912 +#: cmdline/apt-get.cc:2927 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2951 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2966 +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych " -"wersji pakietu %s nie ma odpowiedniej wersji" +"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " +"pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:2957 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2972 +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " -"pakietu %s" +"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " +"wersji kandydującej" -#: cmdline/apt-get.cc:2980 +#: cmdline/apt-get.cc:2995 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:2996 +#: cmdline/apt-get.cc:3011 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:3001 +#: cmdline/apt-get.cc:3016 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 -#, fuzzy, c-format +#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121 +#, c-format msgid "Changelog for %s (%s)" -msgstr "Podłączanie do %s (%s)" +msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:3225 +#: cmdline/apt-get.cc:3240 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:3266 -#, fuzzy +#: cmdline/apt-get.cc:3281 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1438,7 +1457,7 @@ msgstr "" " install - Instaluje nowe pakiety (pakiet to np. libc6, nie libc6.deb)\n" " remove - Usuwa pakiety\n" " autoremove - Usuwa automatycznie wszystkie nieużywane pakiety\n" -" purge - Usuwa i czyści pakiety\n" +" purge - Usuwa pakiety łącznie z plikami konfiguracyjnymi\n" " source - Pobiera archiwa źródłowe\n" " build-dep - Konfiguruje zależności dla budowania pakietów źródłowych\n" " dist-upgrade - Aktualizacja dystrybucji, patrz apt-get(8)\n" @@ -1446,9 +1465,11 @@ msgstr "" " clean - Usuwa pobrane pliki archiwów\n" " autoclean - Usuwa stare pobrane pliki archiwów\n" " check - Sprawdza, czy wszystkie zależności są spełnione\n" +" changelog - Pobiera i wyświetla dziennika zmian wybranych pakietów\n" +" download - Pobiera pakiet binarny do bieżącego katalogu\n" "\n" "Opcje:\n" -" -h Ten tekst pomocy.\n" +" -h Ten tekst pomocy\n" " -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu " "działania)\n" " -qq Nie wypisuje nic oprócz komunikatów błędów\n" @@ -1466,7 +1487,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:3429 +#: cmdline/apt-get.cc:3444 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1474,25 +1495,28 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" "UWAGA: To jest tylko symulacja!\n" -" apt-get wymaga normalnie praw administracyjnych dla działania.\n" +" apt-get wymaga do normalnego działania uprawnień administratora.\n" " Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n" " na związku z rzeczywistą sytuacją!" +# Ujednolicono z aptitude #: cmdline/acqprogress.cc:57 msgid "Hit " -msgstr "Traf " +msgstr "Stary " #: cmdline/acqprogress.cc:81 msgid "Get:" -msgstr "Pob: " +msgstr "Pobieranie:" +# Wyrównane do Hit i Err. #: cmdline/acqprogress.cc:112 msgid "Ign " -msgstr "Ign " +msgstr "Ign. " +# Wyrównane do Hit i Ign. #: cmdline/acqprogress.cc:116 msgid "Err " -msgstr "Błąd " +msgstr "Błąd " #: cmdline/acqprogress.cc:137 #, c-format @@ -1516,43 +1540,45 @@ msgstr "" "do napędu \"%s\" i nacisnąć enter\n" #: cmdline/apt-mark.cc:46 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "ale nie jest zainstalowany" +msgstr "%s nie może zostać oznaczony, ponieważ nie jest zainstalowany.\n" #: cmdline/apt-mark.cc:52 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" +msgstr "%s został już ustawiony jako zainstalowany ręcznie.\n" #: cmdline/apt-mark.cc:54 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" +msgstr "%s został już ustawiony jako zainstalowany automatycznie.\n" #: cmdline/apt-mark.cc:169 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s jest już w najnowszej wersji.\n" +msgstr "%s został już zatrzymany.\n" #: cmdline/apt-mark.cc:171 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s jest już w najnowszej wersji.\n" +msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" +msgstr "%s został zatrzymany.\n" #: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Nie udało się otworzyć %s" +msgstr "Odznaczono zatrzymanie %s\n" +# Musi pasować do su i sudo. #: cmdline/apt-mark.cc:220 msgid "Executing dpkg failed. Are you root?" msgstr "" +"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?" #: cmdline/apt-mark.cc:268 msgid "" @@ -1575,6 +1601,27 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" +"Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n" +"\n" +"apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n" +"jako zainstalowane automatycznie lub ręcznie. Może także służyć\n" +"do wyświetlania stanu oznaczeń.\n" +"\n" +"Polecenia:\n" +" auto - Oznacza dany pakiet jako zainstalowany automatycznie\n" +" manual - Oznacza dany pakiet jako zainstalowany ręcznie\n" +"\n" +"Opcje:\n" +" -h Ten tekst pomocy\n" +" -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu " +"działania)\n" +" -qq Nie wypisuje nic oprócz komunikatów błędów\n" +" -s Symulacja - wyświetla jedynie co powinno zostać zrobione\n" +" -f zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +"Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n" +"i apt.conf(5), aby uzyskać więcej informacji." #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1615,30 +1662,29 @@ msgstr "Proszę nacisnąć enter, aby kontynuować." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Usunąć wszystkie pobrane wcześniej pliki .deb?" +msgstr "Czy usunąć wszystkie pobrane wcześniej pliki .deb?" # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. #: dselect/install:101 -#, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "Wystąpiły problemy przy rozpakowywaniu. Zainstalowane pakiety zostaną" #: dselect/install:102 -#, fuzzy msgid "will be configured. This may result in duplicate errors" msgstr "skonfigurowane. Może to spowodować podwójne błędy lub błędy" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"spowodowane brakującymi zależnościami. To jest normalne. Tylko powyższe" +"spowodowane brakującymi zależnościami. Jest to normalne. Tylko błędy nad tym" #: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "błędy są istotne. Proszę je poprawić i ponownie wybrać [I]nstalację." +msgstr "" +"komunikatem są istotne. Proszę je poprawić i ponownie wybrać [I]nstalację." #: dselect/update:30 msgid "Merging available information" @@ -1674,9 +1720,9 @@ msgid "Error reading archive member header" msgstr "Błąd przy czytaniu nagłówka składnika archiwum" #: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format +#, c-format msgid "Invalid archive member header %s" -msgstr "Nieprawidłowy nagłówek składnika archiwum" +msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" #: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" @@ -1771,7 +1817,7 @@ msgstr "Ścieżka jest zbyt długa" #: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Dopasowanie dla %s nadpisującego pakietu bez wersji" +msgstr "Nadpisujący pakiet nie pasuje z wersją %s" #: apt-inst/extract.cc:429 #, c-format @@ -1782,8 +1828,8 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353 #: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" @@ -1811,11 +1857,11 @@ msgstr "Nie udało się wykonać operacji stat na %sinfo" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików" +msgstr "Pliki info i katalog tymczasowy muszą być w tym samym systemie plików" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 -#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 -#: apt-pkg/pkgcachegen.cc:1320 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063 +#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173 +#: apt-pkg/pkgcachegen.cc:1335 msgid "Reading package lists" msgstr "Czytanie list pakietów" @@ -1874,7 +1920,7 @@ msgstr "Błąd wewnętrzny przy dodawaniu ominięcia" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Magazyn podręczny pakietów musi wcześniej zostać zainicjalizowany" +msgstr "Magazyn podręczny pakietów musi zostać wcześniej zainicjalizowany" #: apt-inst/deb/dpkgdb.cc:439 #, c-format @@ -1916,7 +1962,7 @@ msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" #: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" -msgstr "Nie udało się odnaleźć poprawnego pliku control" +msgstr "Nie udało się odnaleźć poprawnego pliku kontrolnego" #: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" @@ -1924,7 +1970,7 @@ msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" #: methods/bzip2.cc:60 methods/gzip.cc:52 msgid "Empty files can't be valid archives" -msgstr "" +msgstr "Puste pliki nie mogą być prawidłowymi archiwami" #: methods/bzip2.cc:64 #, c-format @@ -1937,22 +1983,22 @@ msgid "Read error from %s process" msgstr "Błąd odczytu z procesu %s" #: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527 +#: methods/rred.cc:536 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" #: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/rred.cc:533 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" -#: methods/cdrom.cc:199 +#: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Nie można odczytać bazy danych CD-ROM-ów %s" -#: methods/cdrom.cc:208 +#: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1960,20 +2006,20 @@ msgstr "" "Proszę użyć programu apt-cdrom, aby APT mógł rozpoznać tę płytę CD. Nowych " "płyt nie można dodawać przy pomocy polecenia apt-get update" -#: methods/cdrom.cc:218 +#: methods/cdrom.cc:219 msgid "Wrong CD-ROM" msgstr "Niewłaściwa płyta CD" -#: methods/cdrom.cc:245 +#: methods/cdrom.cc:246 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używany." -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:251 msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "Nie odnaleziono pliku" @@ -1982,34 +2028,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:168 +#: methods/ftp.cc:169 msgid "Logging in" msgstr "Logowanie się" -#: methods/ftp.cc:174 +#: methods/ftp.cc:175 msgid "Unable to determine the peer name" msgstr "Nie można określić nazwy zdalnego systemu" -#: methods/ftp.cc:179 +#: methods/ftp.cc:180 msgid "Unable to determine the local name" msgstr "Nie udało się określić nazwy lokalnego systemu" -#: methods/ftp.cc:210 methods/ftp.cc:238 +#: methods/ftp.cc:211 methods/ftp.cc:239 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s" -#: methods/ftp.cc:216 +#: methods/ftp.cc:217 #, c-format msgid "USER failed, server said: %s" msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:223 +#: methods/ftp.cc:224 #, c-format msgid "PASS failed, server said: %s" msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:243 +#: methods/ftp.cc:244 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -2017,123 +2063,123 @@ msgstr "" "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, " "Acquire::ftp::ProxyLogin jest puste." -#: methods/ftp.cc:271 +#: methods/ftp.cc:272 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: " "%s" -#: methods/ftp.cc:297 +#: methods/ftp.cc:298 #, c-format msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 +#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" -#: methods/ftp.cc:341 +#: methods/ftp.cc:342 msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 +#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191 msgid "Read error" msgstr "Błąd odczytu" -#: methods/ftp.cc:351 methods/rsh.cc:198 +#: methods/ftp.cc:352 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "Odpowiedź przepełniła bufor." -#: methods/ftp.cc:368 methods/ftp.cc:380 +#: methods/ftp.cc:369 methods/ftp.cc:381 msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 +#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 msgid "Write error" msgstr "Błąd zapisu" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Nie udało się utworzyć gniazda" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Nie udało się połączyć pasywnego gniazda." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Nie udało się przyłączyć gniazda" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Nie udało się nasłuchiwać na gnieździe" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Nie udało się określić nazwy gniazda" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Nie można wysłać polecenia PORT" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Nieznana rodzina adresów %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Przekroczony czas połączenia gniazda danych" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Info" -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Nie można wywołać " #: methods/connect.cc:71 #, c-format msgid "Connecting to %s (%s)" -msgstr "Podłączanie do %s (%s)" +msgstr "Łączenie z %s (%s)" #: methods/connect.cc:82 #, c-format @@ -2178,31 +2224,29 @@ msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" #: methods/connect.cc:196 -#, fuzzy, c-format +#, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)" +msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" #: methods/connect.cc:243 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s:%s:" -msgstr "Nie udało się połączyć z %s %s:" +msgstr "Nie udało się połączyć z %s:%s:" #: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku " -"klucza?!" +"Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" #: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." #: methods/gpgv.cc:175 -#, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -"Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest " +"Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" #: methods/gpgv.cc:180 @@ -2292,7 +2336,7 @@ msgstr "Błędne dane nagłówka" #: methods/http.cc:1200 methods/http.cc:1255 msgid "Connection failed" -msgstr "Połączenie nie udało się" +msgstr "Połączenie nie powiodło się" #: methods/http.cc:1347 msgid "Internal error" @@ -2303,9 +2347,9 @@ msgid "Can't mmap an empty file" msgstr "Nie można wykonać mmap na pustym pliku" #: apt-pkg/contrib/mmap.cc:89 -#, fuzzy, c-format +#, c-format msgid "Couldn't duplicate file descriptor %i" -msgstr "Nie udało się otworzyć potoku dla %s" +msgstr "Nie udało się zduplikować deskryptora pliku %i" #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 #, c-format @@ -2313,14 +2357,12 @@ msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udało się wykonać mmap %lu bajtów" #: apt-pkg/contrib/mmap.cc:124 -#, fuzzy msgid "Unable to close mmap" -msgstr "Nie można otworzyć %s" +msgstr "Nie udało się zamknąć mmap" #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 -#, fuzzy msgid "Unable to synchronize mmap" -msgstr "Nie można wywołać " +msgstr "Nie udało się zsynchronizować mmap" #: apt-pkg/contrib/mmap.cc:310 #, c-format @@ -2337,23 +2379,27 @@ msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" +"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już " +"osiągnięty." #: apt-pkg/contrib/mmap.cc:412 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" +"Nie udało się zwiększyć rozmiaru MMap, ponieważ automatycznie powiększanie " +"zostało wyłączone przez użytkownika." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:371 #, c-format msgid "%lid %lih %limin %lis" -msgstr "%lidni %lih %limin %lis" +msgstr "%lidni %lig %limin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +msgstr "%lig %limin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:385 @@ -2367,7 +2413,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1138 +#: apt-pkg/contrib/strutl.cc:1137 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" @@ -2419,10 +2465,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" #: apt-pkg/contrib/configuration.cc:790 -#, fuzzy, c-format +#, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" +"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu" #: apt-pkg/contrib/configuration.cc:840 #, c-format @@ -2444,43 +2490,43 @@ msgstr "%c%s... Gotowe" msgid "Command line option '%c' [from %s] is not known." msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana." -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109 +#: apt-pkg/contrib/cmndline.cc:117 #, c-format msgid "Command line option %s is not understood" msgstr "Niezrozumiała opcja linii poleceń %s" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not boolean" -msgstr "Opcja linii poleceń %s nie jest typu boolean" +msgstr "Opcja linii poleceń %s nie jest typu logicznego" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opcja %s wymaga argumentu." -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>." -#: apt-pkg/contrib/cmndline.cc:236 +#: apt-pkg/contrib/cmndline.cc:232 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\"" -#: apt-pkg/contrib/cmndline.cc:267 +#: apt-pkg/contrib/cmndline.cc:263 #, c-format msgid "Option '%s' is too long" msgstr "Opcja \"%s\" jest zbyt długa" -#: apt-pkg/contrib/cmndline.cc:300 +#: apt-pkg/contrib/cmndline.cc:295 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Znaczenie %s jest nieznane, spróbuj true albo false." +msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false." -#: apt-pkg/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:345 #, c-format msgid "Invalid operation %s" msgstr "Nieprawidłowa operacja %s" @@ -2491,7 +2537,7 @@ msgid "Unable to stat the mount point %s" msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 +#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39 #: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" @@ -2525,89 +2571,94 @@ msgstr "Nie udało się uzyskać blokady %s" #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" +"Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" #: apt-pkg/contrib/fileutl.cc:362 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" #: apt-pkg/contrib/fileutl.cc:380 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" +"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " +"pliku" #: apt-pkg/contrib/fileutl.cc:389 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" +"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " +"rozszerzenie pliku" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:690 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" -#: apt-pkg/contrib/fileutl.cc:691 +#: apt-pkg/contrib/fileutl.cc:702 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Podproces %s spowodował naruszenie segmentacji." +msgstr "Podproces %s spowodował naruszenie ochrony pamięci." -#: apt-pkg/contrib/fileutl.cc:693 +#: apt-pkg/contrib/fileutl.cc:704 #, c-format msgid "Sub-process %s received signal %u." -msgstr "Podproces %s dostał sygnał %u." +msgstr "Podproces %s otrzymał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:697 +#: apt-pkg/contrib/fileutl.cc:708 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:699 +#: apt-pkg/contrib/fileutl.cc:710 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 +#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:781 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:792 +#, c-format msgid "Could not open file descriptor %d" -msgstr "Nie udało się otworzyć potoku dla %s" +msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:852 #, c-format msgid "read, still have %lu to read but none left" msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:874 +#: apt-pkg/contrib/fileutl.cc:885 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "należało zapisać jeszcze %lu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1010 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1021 +#, c-format msgid "Problem closing the gzip file %s" -msgstr "Problem przy zamykaniu pliku" +msgstr "Problem przy zamykaniu pliku gzip %s" -#: apt-pkg/contrib/fileutl.cc:1013 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1024 +#, c-format msgid "Problem closing the file %s" -msgstr "Problem przy zamykaniu pliku" +msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1018 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1029 +#, c-format msgid "Problem renaming the file %s to %s" -msgstr "Problem przy zapisywaniu pliku na dysk" +msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1029 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1040 +#, c-format msgid "Problem unlinking the file %s" -msgstr "Problem przy usuwaniu pliku" +msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1053 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2638,7 +2689,7 @@ msgstr "Wymaga" #: apt-pkg/pkgcache.cc:299 msgid "PreDepends" -msgstr "PreWymaga" +msgstr "Wymaga wstępnie" #: apt-pkg/pkgcache.cc:299 msgid "Suggests" @@ -2650,7 +2701,7 @@ msgstr "Poleca" #: apt-pkg/pkgcache.cc:300 msgid "Conflicts" -msgstr "Jest w konflikcie z" +msgstr "W konflikcie z" #: apt-pkg/pkgcache.cc:300 msgid "Replaces" @@ -2658,11 +2709,11 @@ msgstr "Zastępuje" #: apt-pkg/pkgcache.cc:301 msgid "Obsoletes" -msgstr "Czyni zbędnym" +msgstr "Dezaktualizuje" #: apt-pkg/pkgcache.cc:301 msgid "Breaks" -msgstr "Psuje" +msgstr "Narusza zależności" #: apt-pkg/pkgcache.cc:301 msgid "Enhances" @@ -2725,29 +2776,31 @@ msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" #: apt-pkg/sourcelist.cc:92 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" +msgstr "" +"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" #: apt-pkg/sourcelist.cc:95 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" #: apt-pkg/sourcelist.cc:106 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" #: apt-pkg/sourcelist.cc:112 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" #: apt-pkg/sourcelist.cc:115 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" +msgstr "" +"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" #: apt-pkg/sourcelist.cc:128 #, c-format @@ -2794,12 +2847,15 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" +"Nie udało się wykonać natychmiastowej konfiguracji %s. Proszę wykonać \"man " +"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " +"się więcej. (%d)" #: apt-pkg/packagemanager.cc:456 #, c-format @@ -2809,9 +2865,9 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego " -"pakietu %s z powodu pętli konfliktów/pre-zależności. Często nie oznacza to " -"nic dobrego, ale jeśli naprawdę chcesz to zrobić, włącz opcję APT::Force-" -"LoopBreak." +"pakietu %s z powodu pętli konfliktów/wymagań wstępnych. Często jest to złe " +"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję " +"APT::Force-LoopBreak." #: apt-pkg/packagemanager.cc:501 #, c-format @@ -2819,6 +2875,9 @@ msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " "see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" +"Nie udało się wykonać natychmiastowej konfiguracji rozpakowanego pakietu %s. " +"Proszę wykonać \"man 5 apt.conf\" i zapoznać się z wpisem APT::Immediate-" +"Configure aby dowiedzieć się więcej." #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2830,7 +2889,8 @@ msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Pakiet %s ma zostać przeinstalowany, ale nie można znaleźć jego archiwum." +"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " +"archiwum." #: apt-pkg/algorithms.cc:1158 msgid "" @@ -2844,38 +2904,37 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 -#, fuzzy +#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" "Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub " -"została użyta ich starsza wersja." +"użyto ich starszej wersji." #: apt-pkg/acquire.cc:79 -#, fuzzy, c-format +#, c-format msgid "List directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." #: apt-pkg/acquire.cc:83 -#, fuzzy, c-format +#, c-format msgid "Archives directory %spartial is missing." msgstr "Brakuje katalogu archiwów %spartial." #: apt-pkg/acquire.cc:91 -#, fuzzy, c-format +#, c-format msgid "Unable to lock directory %s" -msgstr "Nie udało się zablokować katalogu list" +msgstr "Nie udało się zablokować katalogu %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:857 +#: apt-pkg/acquire.cc:861 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Pobieranie pliku %li z %li (%s pozostało)" +msgstr "Pobieranie pliku %li z %li (pozostało %s)" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:863 #, c-format msgid "Retrieving file %li of %li" msgstr "Pobieranie pliku %li z %li" @@ -2895,12 +2954,12 @@ msgstr "Metoda %s nie uruchomiła się poprawnie" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter." -#: apt-pkg/init.cc:147 +#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów \"%s\" nie jest obsługiwany" -#: apt-pkg/init.cc:163 +#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udało się określić odpowiedniego typu systemu pakietów" @@ -2925,24 +2984,26 @@ msgstr "Należy uruchomić apt-get update aby naprawić te problemy." msgid "The list of sources could not be read." msgstr "Nie udało się odczytać list źródeł." -#: apt-pkg/policy.cc:71 +#: apt-pkg/policy.cc:72 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie " +"wydanie nie jest dostępne w źródłach" -#: apt-pkg/policy.cc:389 +#: apt-pkg/policy.cc:390 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" -#: apt-pkg/policy.cc:411 +#: apt-pkg/policy.cc:412 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:419 +#: apt-pkg/policy.cc:420 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypięcia" @@ -2950,91 +3011,89 @@ msgstr "Brak (lub zerowy) priorytet przypięcia" msgid "Cache has an incompatible versioning system" msgstr "Magazyn podręczny ma niezgodny system wersji" -#: apt-pkg/pkgcachegen.cc:187 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:204 +#: apt-pkg/pkgcachegen.cc:207 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:242 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:274 +#: apt-pkg/pkgcachegen.cc:277 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:278 +#: apt-pkg/pkgcachegen.cc:281 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 -#: apt-pkg/pkgcachegen.cc:313 -#, fuzzy, c-format +#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308 +#: apt-pkg/pkgcachegen.cc:316 +#, c-format msgid "Error occurred while processing %s (NewVersion%d)" -msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion1)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion%d)" -#: apt-pkg/pkgcachegen.cc:309 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:342 +#: apt-pkg/pkgcachegen.cc:345 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)" -#: apt-pkg/pkgcachegen.cc:348 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Och, przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć." +msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:351 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Och, przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć." +msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:354 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Och, przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć." +msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:357 +#: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Och, przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." +msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:386 +#: apt-pkg/pkgcachegen.cc:389 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:400 +#: apt-pkg/pkgcachegen.cc:403 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:406 +#: apt-pkg/pkgcachegen.cc:409 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:960 +#: apt-pkg/pkgcachegen.cc:975 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:1065 +#: apt-pkg/pkgcachegen.cc:1080 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 +#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" @@ -3047,53 +3106,59 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 -#: apt-pkg/acquire-item.cc:1991 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1990 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:1387 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" +"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " +"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" #: apt-pkg/acquire-item.cc:1403 -#, fuzzy, c-format +#, c-format msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Nie udało się zanalizować pliku Release %s" +msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1438 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " +"repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1498 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" +msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1531 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" +"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i " +"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 #, c-format msgid "GPG error: %s: %s" -msgstr "" +msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1639 +#: apt-pkg/acquire-item.cc:1638 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3102,7 +3167,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1698 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3111,21 +3176,21 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1752 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1840 +#: apt-pkg/acquire-item.cc:1839 msgid "Size mismatch" msgstr "Błędny rozmiar" #: apt-pkg/indexrecords.cc:53 #, c-format msgid "Unable to parse Release file %s" -msgstr "Nie udało się zanalizować pliku Release %s" +msgstr "Nie udało się przeanalizować pliku Release %s" #: apt-pkg/indexrecords.cc:63 #, c-format @@ -3138,14 +3203,14 @@ msgid "No Hash entry in Release file %s" msgstr "Brak wpisu Hash w pliku Release %s" #: apt-pkg/indexrecords.cc:110 -#, fuzzy, c-format +#, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Brak wpisu Hash w pliku Release %s" +msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s" -#: apt-pkg/indexrecords.cc:125 -#, fuzzy, c-format +#: apt-pkg/indexrecords.cc:129 +#, c-format msgid "Invalid 'Date' entry in Release file %s" -msgstr "Brak wpisu Hash w pliku Release %s" +msgstr "Nieprawidłowy wpis Date w pliku Release %s" #: apt-pkg/vendorlist.cc:71 #, c-format @@ -3158,8 +3223,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Użycie %s jako punktu montowania CD-ROMu\n" -"Montowanie CD-ROMu\n" +"Użycie %s jako punktu montowania CD-ROM-u\n" +"Montowanie CD-ROM-u\n" #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 msgid "Identifying.. " @@ -3172,16 +3237,16 @@ msgstr "Etykieta: %s \n" #: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 msgid "Unmounting CD-ROM...\n" -msgstr "Odmontowanie CD-ROMu...\n" +msgstr "Odmontowanie CD-ROM-u...\n" #: apt-pkg/cdrom.cc:591 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Użycie %s jako punktu montowania CD-ROMu\n" +msgstr "Użycie %s jako punktu montowania CD-ROM-u\n" #: apt-pkg/cdrom.cc:609 msgid "Unmounting CD-ROM\n" -msgstr "Odmontowanie CD-ROMu\n" +msgstr "Odmontowanie CD-ROM-u\n" #: apt-pkg/cdrom.cc:614 msgid "Waiting for disc...\n" @@ -3189,7 +3254,7 @@ msgstr "Oczekiwanie na płytę...\n" #: apt-pkg/cdrom.cc:623 msgid "Mounting CD-ROM...\n" -msgstr "Montowanie CD-ROMu...\n" +msgstr "Montowanie CD-ROM-u...\n" #: apt-pkg/cdrom.cc:642 msgid "Scanning disc for index files..\n" @@ -3210,7 +3275,7 @@ msgid "" "wrong architecture?" msgstr "" "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk " -"Debiana lub inna architektura?" +"Debiana lub jest to inna architektura?" #: apt-pkg/cdrom.cc:722 #, c-format @@ -3219,7 +3284,7 @@ msgstr "Znaleziono etykietę \"%s\"\n" #: apt-pkg/cdrom.cc:751 msgid "That is not a valid name, try again.\n" -msgstr "To nie jest prawidłowa nazwa, spróbuj ponownie.\n" +msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n" #: apt-pkg/cdrom.cc:768 #, c-format @@ -3242,51 +3307,51 @@ msgstr "Zapisywanie nowej listy źródeł\n" msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" #: apt-pkg/indexcopy.cc:537 -#, fuzzy, c-format +#, c-format msgid "Skipping nonexistent file %s" -msgstr "Otwieranie pliku konfiguracyjnego %s" +msgstr "Pomijanie nieistniejącego pliku %s" #: apt-pkg/indexcopy.cc:543 #, c-format msgid "Can't find authentication record for: %s" -msgstr "" +msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s" #: apt-pkg/indexcopy.cc:549 -#, fuzzy, c-format +#, c-format msgid "Hash mismatch for: %s" -msgstr "Błędna suma kontrolna" +msgstr "Błędna suma kontrolna dla: %s" #: apt-pkg/indexcopy.cc:677 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign" #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:708 -#, fuzzy, c-format +#, c-format msgid "No keyring installed in %s." -msgstr "Przerywanie instalacji" +msgstr "Brak zainstalowanej bazy kluczy w %s." #: apt-pkg/cacheset.cc:337 #, c-format @@ -3299,19 +3364,22 @@ msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" #: apt-pkg/cacheset.cc:447 -#, fuzzy, c-format +#, c-format msgid "Couldn't find task '%s'" -msgstr "Nie udało się odnaleźć zadania %s" +msgstr "Nie udało się odnaleźć zadania \"%s\"" #: apt-pkg/cacheset.cc:454 -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by regex '%s'" -msgstr "Nie udało się odnaleźć pakietu %s" +msgstr "" +"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" #: apt-pkg/cacheset.cc:467 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" +"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto " +"wirtualny" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 #, c-format @@ -3319,21 +3387,29 @@ msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" +"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " +"ponieważ nie ma żadnej z nich" #: apt-pkg/cacheset.cc:491 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" +"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on " +"czysto wirtualny" #: apt-pkg/cacheset.cc:499 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" +"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma " +"kandydata" #: apt-pkg/cacheset.cc:507 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" +"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest " +"zainstalowany" #: apt-pkg/deb/dpkgpm.cc:54 #, c-format @@ -3351,14 +3427,14 @@ msgid "Removing %s" msgstr "Usuwanie %s" #: apt-pkg/deb/dpkgpm.cc:57 -#, fuzzy, c-format +#, c-format msgid "Completely removing %s" -msgstr "Całkowicie usunięto %s" +msgstr "Całkowite usuwanie %s" #: apt-pkg/deb/dpkgpm.cc:58 #, c-format msgid "Noting disappearance of %s" -msgstr "" +msgstr "Proszę odnotować zniknięcie %s" #: apt-pkg/deb/dpkgpm.cc:59 #, c-format @@ -3372,14 +3448,14 @@ msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" #: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689 -#, fuzzy, c-format +#, c-format msgid "Could not open file '%s'" -msgstr "Nie udało się otworzyć pliku %s" +msgstr "Nie udało się otworzyć pliku \"%s\"" #: apt-pkg/deb/dpkgpm.cc:841 #, c-format msgid "Preparing %s" -msgstr "Przygotowanie %s" +msgstr "Przygotowywanie %s" #: apt-pkg/deb/dpkgpm.cc:842 #, c-format @@ -3389,74 +3465,82 @@ msgstr "Rozpakowywanie %s" #: apt-pkg/deb/dpkgpm.cc:847 #, c-format msgid "Preparing to configure %s" -msgstr "Przygotowanie do konfiguracji %s" +msgstr "Przygotowywanie do konfiguracji %s" #: apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Installed %s" -msgstr "Zainstalowany %s" +msgstr "Pakiet %s został zainstalowany" #: apt-pkg/deb/dpkgpm.cc:854 #, c-format msgid "Preparing for removal of %s" -msgstr "Przygotowanie do usunięcia %s" +msgstr "Przygotowywanie do usunięcia %s" #: apt-pkg/deb/dpkgpm.cc:856 #, c-format msgid "Removed %s" -msgstr "Usunięto %s" +msgstr "Pakiet %s został usunięty" #: apt-pkg/deb/dpkgpm.cc:861 #, c-format msgid "Preparing to completely remove %s" -msgstr "Przygotowanie do całkowitego usunięcia %s" +msgstr "Przygotowywanie do całkowitego usunięcia %s" #: apt-pkg/deb/dpkgpm.cc:862 #, c-format msgid "Completely removed %s" -msgstr "Całkowicie usunięto %s" +msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1082 +#: apt-pkg/deb/dpkgpm.cc:1087 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie " +"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie jest " "zamontowane?)\n" -#: apt-pkg/deb/dpkgpm.cc:1113 +#: apt-pkg/deb/dpkgpm.cc:1118 msgid "Running dpkg" msgstr "Uruchamianie dpkg" -#: apt-pkg/deb/dpkgpm.cc:1338 +#: apt-pkg/deb/dpkgpm.cc:1344 msgid "No apport report written because MaxReports is reached already" -msgstr "" +msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1343 +#: apt-pkg/deb/dpkgpm.cc:1349 msgid "dependency problems - leaving unconfigured" -msgstr "" +msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1345 +#: apt-pkg/deb/dpkgpm.cc:1351 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " +"przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1357 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " +"przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1357 +#: apt-pkg/deb/dpkgpm.cc:1363 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " +"braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1364 +#: apt-pkg/deb/dpkgpm.cc:1370 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " +"wejścia/wyjścia dpkg" #: apt-pkg/deb/debsystem.cc:69 #, c-format @@ -3467,62 +3551,67 @@ msgstr "" "Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go " "używa?" +# Musi pasować do su i sudo. #: apt-pkg/deb/debsystem.cc:72 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" -"Nie udało się zablokować katalogu administracyjnego (%s), czy jesteś rootem?" +"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto " +"uprawnień administratora?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a #: apt-pkg/deb/debsystem.cc:88 -#, fuzzy, c-format +#, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"dpkg został przerwany, należy ręcznie uruchomić \"dpkg --configure -a\" aby " -"naprawić problem." +"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem." #: apt-pkg/deb/debsystem.cc:106 msgid "Not locked" -msgstr "Nie zablokowany" +msgstr "Niezablokowany" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:260 #, c-format msgid "No mirror file '%s' found " -msgstr "" +msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\"" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Nie udało się otworzyć pliku %s" +msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" #: methods/mirror.cc:422 #, c-format msgid "[Mirror: %s]" -msgstr "" +msgstr "[Serwer lustrzany: %s]" -#: methods/rred.cc:503 +#: methods/rred.cc:506 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" +"Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka " +"wygląda na uszkodzoną." -#: methods/rred.cc:508 +#: methods/rred.cc:511 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" +"Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z " +"mmap - łatka wygląda na uszkodzoną" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Połączenie zostało zamknięte przedwcześnie" +msgstr "Połączenie zostało przedwcześnie zamknięte" #~ msgid "Internal error, could not locate member" #~ msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika" diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note new file mode 100644 index 000000000..3e8a9e71d --- /dev/null +++ b/share/apt-auth-failure.note @@ -0,0 +1,11 @@ +_Name: Apt Authentication issue +Priority: High +Terminal: False +Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window +GettextDomain: apt +_Description: Problem during package list update. + The package list update failed with a authentication failure. + This usually happens behind a network proxy server. Please try + to click on the "Run this action now" button to correct the problem or + update the list manually by running Update Manager and clicking + on "Check". diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg Binary files differnew file mode 100644 index 000000000..2ce60d454 --- /dev/null +++ b/share/ubuntu-archive.gpg diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub Binary files differnew file mode 100644 index 000000000..642952a40 --- /dev/null +++ b/test/integration/exploid-keyring-with-dupe-keys.pub diff --git a/test/integration/skip-avoid-avoiding-breaks-predepends b/test/integration/skip-avoid-avoiding-breaks-predepends new file mode 100755 index 000000000..a47e8bc2b --- /dev/null +++ b/test/integration/skip-avoid-avoiding-breaks-predepends @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'native' + +insertinstalledpackage 'looping' 'native' '1' +insertinstalledpackage 'loop1' 'native' '1' 'Depends: loop2 (= 1)' +insertinstalledpackage 'loop2' 'native' '1' 'Depends: loop1 (= 1)' + +buildsimplenativepackage 'looping' 'native' '1.15.7.2' 'stable' 'Breaks: loop2 (<= 1)' +buildsimplenativepackage 'loop1' 'native' '2' 'stable' 'Depends: loop2 (= 2)' +buildsimplenativepackage 'loop2' 'native' '2' 'stable' 'Depends: loop1 (= 2) +Pre-Depends: looping (>= 1.15)' + +setupaptarchive + +aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq 2>&1 > /dev/null +testdpkginstalled looping loop1 loop2 diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update new file mode 100755 index 000000000..bc4e6029f --- /dev/null +++ b/test/integration/test-apt-key-net-update @@ -0,0 +1,68 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +# mock +requires_root() { + return 0 +} + +# extract net_update() and import it +func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key ) +eval "$func" + +mkdir -p ./etc/apt +TRUSTEDFILE=./etc/apt/trusted.gpg +mkdir -p ./var/lib/apt/keyrings +TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring" +GPG="$GPG_CMD --keyring $TRUSTEDFILE" +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg + + +msgtest "add_keys_with_verify_against_master_keyring" +if [ ! -e $MASTER_KEYRING ]; then + echo -n "No $MASTER_KEYRING found" + msgskip + exit 0 +fi + +# test bad keyring and ensure its not added (LP: #857472) +ADD_KEYRING=./keys/exploid-keyring-with-dupe-keys.pub +if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then + msgfail +else + msgpass +fi + +# ensure the keyring is still empty +gpg_out=$($GPG --list-keys) +msgtest "Test if keyring is empty" +if [ -n "" ]; then + msgfail +else + msgpass +fi + +# test good keyring and ensure we get no errors +ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then + msgpass +else + msgfail +fi + +testequal './etc/apt/trusted.gpg +--------------------- +pub 1024D/437D05B5 2004-09-12 +uid Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com> +sub 2048g/79164387 2004-09-12 + +pub 1024D/FBB75451 2004-12-30 +uid Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com> +' $GPG --list-keys diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep index 7333054cc..fde075172 100755 --- a/test/integration/test-bug-618288-multiarch-same-lockstep +++ b/test/integration/test-bug-618288-multiarch-same-lockstep @@ -16,30 +16,22 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' '' buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required' setupaptarchive +aptget dist-upgrade -s 2>&1 > output.apt # order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together -testequalor2 'Reading package lists... -Building dependency tree... -The following packages will be upgraded: - apt:i386 apt2 libsame libsame:i386 -4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Inst libsame:i386 [1] (2 unstable [i386]) [libsame:amd64 on libsame:i386] [libsame:i386 on libsame:amd64] [libsame:amd64 apt:i386 ] -Inst libsame [1] (2 unstable [amd64]) [apt2:amd64 apt:i386 ] -Conf libsame:i386 (2 unstable [i386]) [apt2:amd64 apt:i386 ] -Conf libsame (2 unstable [amd64]) [apt2:amd64 apt:i386 ] -Inst apt2 [1] (2 unstable [amd64]) [apt:i386 ] -Conf apt2 (2 unstable [amd64]) [apt:i386 ] -Inst apt:i386 [1] (2 unstable [i386]) -Conf apt:i386 (2 unstable [i386])' 'Reading package lists... -Building dependency tree... -The following packages will be upgraded: - apt:i386 apt2 libsame libsame:i386 -4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Inst libsame [1] (2 unstable [amd64]) [libsame:amd64 on libsame:i386] [libsame:i386 on libsame:amd64] [libsame:i386 apt2:amd64 ] -Inst libsame:i386 [1] (2 unstable [i386]) [apt2:amd64 apt:i386 ] -Conf libsame:i386 (2 unstable [i386]) [apt2:amd64 apt:i386 ] -Conf libsame (2 unstable [amd64]) [apt2:amd64 apt:i386 ] -Inst apt2 [1] (2 unstable [amd64]) [apt:i386 ] -Conf apt2 (2 unstable [amd64]) [apt:i386 ] -Inst apt:i386 [1] (2 unstable [i386]) -Conf apt:i386 (2 unstable [i386])' aptget dist-upgrade -s +LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)" +LS_U_INT="$(grep -o -n '^Inst libsame:i386 ' output.apt | cut -d: -f1)" +LS_C_AMD="$(grep -o -n '^Conf libsame ' output.apt | cut -d: -f1)" +LS_C_INT="$(grep -o -n '^Conf libsame:i386 ' output.apt | cut -d: -f1)" + +msgtest 'Test if libsame:amd64 unpack before configure' +test "$LS_U_AMD" -lt "$LS_C_AMD" && msgpass || msgfail + +msgtest 'Test if libsame:i386 unpack before configure' +test "$LS_U_INT" -lt "$LS_C_INT" && msgpass || msgfail + +msgtest 'Test if libsame:amd64 unpack is before libsame:i386 configure' +test "$LS_U_AMD" -lt "$LS_C_INT" && msgpass || msgfail + +msgtest 'Test if libsame:i386 unpack is before libsame:amd64 configure' +test "$LS_U_INT" -lt "$LS_C_AMD" && msgpass || msgfail diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction index 4299f052f..30df48604 100755 --- a/test/integration/test-bug-632221-cross-dependency-satisfaction +++ b/test/integration/test-bug-632221-cross-dependency-satisfaction @@ -6,43 +6,51 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'amd64' 'armel' -insertinstalledpackage 'build-essential' 'all' '11.5' +insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign' -insertpackage 'unstable' 'doxygen' 'amd64,armel' '1.0' +insertpackage 'unstable' 'doxygen' 'amd64,armel' '1.0' 'Multi-Arch: foreign' insertpackage 'unstable' 'libc6' 'amd64,armel' '1.0' 'Multi-Arch: same' insertpackage 'unstable' 'libc6-dev' 'amd64,armel' '1.0' 'Depends: libc6 Multi-Arch: same' +insertpackage 'unstable' 'libfwibble1' 'amd64,armel' '1.0' 'Depends: libc6 +Multi-Arch: same' +insertpackage 'unstable' 'libfwibble-dev' 'amd64,armel' '1.0' 'Depends: libfwibble1' insertpackage 'unstable' 'cool' 'amd64,armel' '1.0' 'Multi-Arch: allowed' insertpackage 'unstable' 'amdboot' 'amd64' '1.0' insertpackage 'unstable' 'foreigner' 'amd64,armel' '1.0' 'Multi-Arch: foreign' -insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner' +insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev' setupaptarchive testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot cool doxygen foreigner libc6 libc6-dev -0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. + amdboot cool doxygen foreigner libc6 libc6-dev libfwibble-dev libfwibble1 +0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst cool (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) Inst foreigner (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [amd64]) +Inst libfwibble1 (1.0 unstable [amd64]) +Inst libfwibble-dev (1.0 unstable [amd64]) Conf amdboot (1.0 unstable [amd64]) Conf cool (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) Conf foreigner (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) -Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s +Conf libc6-dev (1.0 unstable [amd64]) +Conf libfwibble1 (1.0 unstable [amd64]) +Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot cool doxygen foreigner libc6 libc6:armel libc6-dev libc6-dev:armel -0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. + libfwibble-dev:armel libfwibble1:armel +0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst cool (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) @@ -51,6 +59,8 @@ Inst libc6 (1.0 unstable [amd64]) Inst libc6:armel (1.0 unstable [armel]) Inst libc6-dev (1.0 unstable [amd64]) Inst libc6-dev:armel (1.0 unstable [armel]) +Inst libfwibble1:armel (1.0 unstable [armel]) +Inst libfwibble-dev:armel (1.0 unstable [armel]) Conf amdboot (1.0 unstable [amd64]) Conf cool (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) @@ -58,34 +68,41 @@ Conf foreigner (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf libc6:armel (1.0 unstable [armel]) Conf libc6-dev (1.0 unstable [amd64]) -Conf libc6-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel +Conf libc6-dev:armel (1.0 unstable [armel]) +Conf libfwibble1:armel (1.0 unstable [armel]) +Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel configarchitecture 'armel' 'amd64' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot:amd64 cool doxygen foreigner libc6 libc6-dev -0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. + amdboot:amd64 cool doxygen foreigner libc6 libc6-dev libfwibble-dev + libfwibble1 +0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) Inst foreigner (1.0 unstable [armel]) Inst libc6 (1.0 unstable [armel]) Inst libc6-dev (1.0 unstable [armel]) +Inst libfwibble1 (1.0 unstable [armel]) +Inst libfwibble-dev (1.0 unstable [armel]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) Conf foreigner (1.0 unstable [armel]) Conf libc6 (1.0 unstable [armel]) -Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s +Conf libc6-dev (1.0 unstable [armel]) +Conf libfwibble1 (1.0 unstable [armel]) +Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot:amd64 cool doxygen foreigner libc6:amd64 libc6 libc6-dev:amd64 - libc6-dev -0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. + libc6-dev libfwibble-dev:amd64 libfwibble1:amd64 +0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) @@ -94,6 +111,8 @@ Inst libc6:amd64 (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [armel]) Inst libc6-dev:amd64 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [armel]) +Inst libfwibble1:amd64 (1.0 unstable [amd64]) +Inst libfwibble-dev:amd64 (1.0 unstable [amd64]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) @@ -101,7 +120,9 @@ Conf foreigner (1.0 unstable [armel]) Conf libc6:amd64 (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [armel]) Conf libc6-dev:amd64 (1.0 unstable [amd64]) -Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s -a amd64 +Conf libc6-dev (1.0 unstable [armel]) +Conf libfwibble1:amd64 (1.0 unstable [amd64]) +Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 configarchitecture 'amd64' 'armel' @@ -111,34 +132,43 @@ insertinstalledpackage 'foreigner' 'armel' '0.5' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot doxygen libc6 libc6-dev -0 upgraded, 4 newly installed, 0 to remove and 2 not upgraded. + amdboot doxygen libc6 libc6-dev libfwibble-dev libfwibble1 +0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [amd64]) +Inst libfwibble1 (1.0 unstable [amd64]) +Inst libfwibble-dev (1.0 unstable [amd64]) Conf amdboot (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) -Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s +Conf libc6-dev (1.0 unstable [amd64]) +Conf libfwibble1 (1.0 unstable [amd64]) +Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot doxygen libc6 libc6:armel libc6-dev libc6-dev:armel -0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded. + libfwibble-dev:armel libfwibble1:armel +0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [amd64]) Inst libc6:armel (1.0 unstable [armel]) Inst libc6-dev (1.0 unstable [amd64]) Inst libc6-dev:armel (1.0 unstable [armel]) +Inst libfwibble1:armel (1.0 unstable [armel]) +Inst libfwibble-dev:armel (1.0 unstable [armel]) Conf amdboot (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf libc6:armel (1.0 unstable [armel]) Conf libc6-dev (1.0 unstable [amd64]) -Conf libc6-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel +Conf libc6-dev:armel (1.0 unstable [armel]) +Conf libfwibble1:armel (1.0 unstable [armel]) +Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel configarchitecture 'armel' 'amd64' @@ -148,36 +178,45 @@ Building dependency tree... The following packages will be REMOVED: cool:amd64 The following NEW packages will be installed: - amdboot:amd64 cool doxygen libc6 libc6-dev -0 upgraded, 5 newly installed, 1 to remove and 1 not upgraded. + amdboot:amd64 cool doxygen libc6 libc6-dev libfwibble-dev libfwibble1 +0 upgraded, 7 newly installed, 1 to remove and 1 not upgraded. Remv cool:amd64 [0.5] Inst amdboot:amd64 (1.0 unstable [amd64]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) Inst libc6 (1.0 unstable [armel]) Inst libc6-dev (1.0 unstable [armel]) +Inst libfwibble1 (1.0 unstable [armel]) +Inst libfwibble-dev (1.0 unstable [armel]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) Conf libc6 (1.0 unstable [armel]) -Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s +Conf libc6-dev (1.0 unstable [armel]) +Conf libfwibble1 (1.0 unstable [armel]) +Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot:amd64 doxygen libc6:amd64 libc6 libc6-dev:amd64 libc6-dev -0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded. + libfwibble-dev:amd64 libfwibble1:amd64 +0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [armel]) Inst libc6:amd64 (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [armel]) Inst libc6-dev:amd64 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [armel]) +Inst libfwibble1:amd64 (1.0 unstable [amd64]) +Inst libfwibble-dev:amd64 (1.0 unstable [amd64]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [armel]) Conf libc6:amd64 (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [armel]) Conf libc6-dev:amd64 (1.0 unstable [amd64]) -Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s -a amd64 +Conf libc6-dev (1.0 unstable [armel]) +Conf libfwibble1:amd64 (1.0 unstable [amd64]) +Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 diff --git a/test/integration/test-bug-657695-resolver-breaks-on-virtuals b/test/integration/test-bug-657695-resolver-breaks-on-virtuals new file mode 100755 index 000000000..e9b27cfcd --- /dev/null +++ b/test/integration/test-bug-657695-resolver-breaks-on-virtuals @@ -0,0 +1,51 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +insertinstalledpackage 'xserver-xorg-core' 'amd64' '2:1.7.6-2ubuntu7.10' +for i in $(seq 1 50); do + insertinstalledpackage "xserver-xorg-video-driver$i" 'amd64' '1.0' 'Provides: xserver-xorg-video-6' +done + +insertpackage 'unstable' 'xserver-xorg-core' 'amd64' '2:1.11.3-0ubuntu9' 'Breaks: xserver-xorg-video-6' + + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + xserver-xorg-video-driver1 xserver-xorg-video-driver10 + xserver-xorg-video-driver11 xserver-xorg-video-driver12 + xserver-xorg-video-driver13 xserver-xorg-video-driver14 + xserver-xorg-video-driver15 xserver-xorg-video-driver16 + xserver-xorg-video-driver17 xserver-xorg-video-driver18 + xserver-xorg-video-driver19 xserver-xorg-video-driver2 + xserver-xorg-video-driver20 xserver-xorg-video-driver21 + xserver-xorg-video-driver22 xserver-xorg-video-driver23 + xserver-xorg-video-driver24 xserver-xorg-video-driver25 + xserver-xorg-video-driver26 xserver-xorg-video-driver27 + xserver-xorg-video-driver28 xserver-xorg-video-driver29 + xserver-xorg-video-driver3 xserver-xorg-video-driver30 + xserver-xorg-video-driver31 xserver-xorg-video-driver32 + xserver-xorg-video-driver33 xserver-xorg-video-driver34 + xserver-xorg-video-driver35 xserver-xorg-video-driver36 + xserver-xorg-video-driver37 xserver-xorg-video-driver38 + xserver-xorg-video-driver39 xserver-xorg-video-driver4 + xserver-xorg-video-driver40 xserver-xorg-video-driver41 + xserver-xorg-video-driver42 xserver-xorg-video-driver43 + xserver-xorg-video-driver44 xserver-xorg-video-driver45 + xserver-xorg-video-driver46 xserver-xorg-video-driver47 + xserver-xorg-video-driver48 xserver-xorg-video-driver49 + xserver-xorg-video-driver5 xserver-xorg-video-driver50 + xserver-xorg-video-driver6 xserver-xorg-video-driver7 + xserver-xorg-video-driver8 xserver-xorg-video-driver9 +The following packages will be upgraded: + xserver-xorg-core +1 upgraded, 0 newly installed, 50 to remove and 0 not upgraded. +After this operation, 2150 kB disk space will be freed. +E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop index 7b5724d74..25f005969 100755 --- a/test/integration/test-conflicts-loop +++ b/test/integration/test-conflicts-loop @@ -20,14 +20,15 @@ Building dependency tree... The following packages will be upgraded: openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. - openjdk-6-jre-lib conflicts with openjdk-6-jre - openjdk-6-jre conflicts with openjdk-6-jre-headless - openjdk-6-jre-headless conflicts with openjdk-6-jre + openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386 + openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386 + openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386 Remv openjdk-6-jre [6b16-1.8-0ubuntu1] - openjdk-6-jre-headless conflicts with openjdk-6-jre-lib + openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1] Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) - openjdk-6-jre conflicts with openjdk-6-jre-lib + openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386 + openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386 Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) diff --git a/test/integration/test-ordering-ignore-not-matching-breaks b/test/integration/test-ordering-ignore-not-matching-breaks new file mode 100755 index 000000000..c9fca4edf --- /dev/null +++ b/test/integration/test-ordering-ignore-not-matching-breaks @@ -0,0 +1,56 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertpackage 'unstable-mp' 'crda' 'i386,amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda +Multi-Arch: foreign' +insertpackage 'unstable-m' 'crda' 'i386,amd64' '1.1.1-1ubuntu4m' 'Multi-Arch: foreign' +insertpackage 'unstable-p' 'crda' 'i386,amd64' '1.1.1-1ubuntu4p' 'Provides: wireless-crda' +insertpackage 'unstable' 'wireless-crda' 'i386,amd64' '1.16' + + +insertinstalledpackage 'wireless-crda' 'amd64' '1.14' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst crda (1.1.1-1ubuntu4m unstable-m [amd64]) +Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst crda (1.1.1-1ubuntu4p unstable-p [amd64]) +Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst crda (1.1.1-1ubuntu4mp unstable-mp [amd64]) +Conf crda (1.1.1-1ubuntu4mp unstable-mp [amd64])' aptget install crda -s -t unstable-mp + +rm rootdir/var/lib/dpkg/status +insertinstalledpackage 'crda' 'amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda +Conflicts: wireless-crda (<< 1.15) +Replaces: wireless-crda ( << 1.15) +Multi-arch: foreign' + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + wireless-crda +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst wireless-crda (1.16 unstable [amd64]) +Conf wireless-crda (1.16 unstable [amd64])' aptget install wireless-crda -s -t unstable diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package index c91e77844..35de22115 100755 --- a/test/integration/test-pin-non-existent-package +++ b/test/integration/test-pin-non-existent-package @@ -6,7 +6,7 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" -insertpackage 'unstable' 'apt' 'i386' '0.8.15' +insertpackage 'unstable' 'rapt' 'i386' '0.8.15' insertpackage 'unstable' 'arch' 'i386' '1.0' setupaptarchive @@ -22,40 +22,40 @@ testcandidate() { fi } -testcandidate apt '0.8.15' +testcandidate rapt '0.8.15' testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0 testequal 'Reading package lists... Building dependency tree... -0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only -echo 'Package: apt +echo 'Package: rapt Pin: release a=unstable Pin-Priority: -1' > rootdir/etc/apt/preferences -testcandidate apt '(none)' +testcandidate rapt '(none)' testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0 testequal 'Reading package lists... Building dependency tree... -0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only echo ' Package: doesntexist Pin: release a=unstable Pin-Priority: 1000' >> rootdir/etc/apt/preferences -testcandidate apt '(none)' +testcandidate rapt '(none)' echo ' -Package: apt +Package: rapt Pin: release a=unstable Pin-Priority: 1000' >> rootdir/etc/apt/preferences -testcandidate apt '(none)' +testcandidate rapt '(none)' testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0 testequal 'Reading package lists... Building dependency tree... -0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only echo 'Package: arch:amd64 Pin: release a=unstable diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 8bf02a78f..4f65cfa3b 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -153,6 +153,35 @@ runtest() { installaptold } +runtest2() { + prepare ${PKGFILE} + rm -rf rootdir/var/lib/apt/lists + signreleasefiles 'Joe Sixpack' + msgtest 'Cold archive signed by' 'Joe Sixpack' + aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgfail || msgpass + + # New .deb but now an unsigned archive. For example MITM to circumvent + # package verification. + prepare ${PKGFILE}-new + find aptarchive/ -name InRelease -delete + find aptarchive/ -name Release.gpg -delete + msgtest 'Warm archive signed by' 'nobody' + aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgfail || msgpass + testequal "$(cat ${PKGFILE}-new) +" aptcache show apt + failaptnew + + # Unsigned archive from the beginning must also be detected. + rm -rf rootdir/var/lib/apt/lists + msgtest 'Cold archive signed by' 'nobody' + aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgfail || msgpass + testequal "$(cat ${PKGFILE}-new) +" aptcache show apt + failaptnew +} +runtest2 + + DELETEFILE="InRelease" runtest DELETEFILE="Release.gpg" diff --git a/test/integration/test-ubuntu-bug-859188-multiarch-reinstall b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall new file mode 100755 index 000000000..0fdf97485 --- /dev/null +++ b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' 'armel' + +buildsimplenativepackage 'libsame' 'amd64,i386,armel' '1.0' 'unstable' 'Multi-Arch: same' + +# FIXME: hack around dpkg's current inability to handle multiarch, a clean install would be better… +insertinstalledpackage 'libsame' 'amd64,i386' '1.0' 'Multi-Arch: same' +sed -e 's#/installed#/unstable#' -e 's#Installed-Size: 42#Installed-Size: 1#' -i rootdir/var/lib/dpkg/status + +setupaptarchive + +REINSTALL='Reading package lists... +Building dependency tree... +0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded. +Inst libsame [1.0] (1.0 unstable [amd64]) +Inst libsame:i386 [1.0] (1.0 unstable [i386]) +Conf libsame (1.0 unstable [amd64]) +Conf libsame:i386 (1.0 unstable [i386])' + +testequal "$REINSTALL" aptget install --reinstall libsame -s +testequal "$REINSTALL" aptget install --reinstall libsame:amd64 -s +testequal "$REINSTALL" aptget install --reinstall libsame:i386 -s +testequal "$REINSTALL" aptget install --reinstall libsame:amd64 libsame:i386 -s diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index 5b23d17fb..9a3e2c118 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -71,6 +71,15 @@ int main(int argc,const char *argv[]) { equals(Cnf.Find("APT2::Version", "33"), "33"); equals(Cnf.FindI("APT2::Version", 33), 33); + equals(Cnf.FindFile("Dir::State"), ""); + equals(Cnf.FindFile("Dir::Aptitude::State"), ""); + Cnf.Set("Dir", "/srv/sid"); + equals(Cnf.FindFile("Dir::State"), ""); + Cnf.Set("Dir::State", "var/lib/apt"); + Cnf.Set("Dir::Aptitude::State", "var/lib/aptitude"); + equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt"); + equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude"); + //FIXME: Test for configuration file parsing; // currently only integration/ tests test them implicitly |