From: Michael Vogt Date: Fri, 24 Jun 2005 14:37:24 +0000 (+0000) Subject: * merged with apt--main and apt--fixes X-Git-Tag: 0.7.24ubuntu1~254^2~23 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a0732d0baf2d71a9360a2206b94236a0e3496097?hp=-c * merged with apt--main and apt--fixes Patches applied: * apt@packages.debian.org/apt--main--0--patch-80 Merge michael.vogt@ubuntu.com--2005/apt--fixes--0 * apt@packages.debian.org/apt--main--0--patch-81 Open 0.6.37 * apt@packages.debian.org/apt--main--0--patch-82 merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-83 Update changelog * apt@packages.debian.org/apt--main--0--patch-84 Fix build of French man pages (now using XML, not SGML) * apt@packages.debian.org/apt--main--0--patch-85 Merge patch from Philippe Batailler for French man page build * apt@packages.debian.org/apt--main--0--patch-86 add Welsh translations from Dafydd Harries * apt@packages.debian.org/apt--main--0--patch-87 Update changelog * apt@packages.debian.org/apt--main--0--patch-88 Change debian/bugscript to use #!/bin/bash (Closes: #313402) * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * bubulle@debian.org--2005/apt--main--0--patch-66 Italian translation complete * bubulle@debian.org--2005/apt--main--0--patch-67 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-68 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-69 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-70 Re-generate the POT and PO files from sources * bubulle@debian.org--2005/apt--main--0--patch-71 Update French translation * bubulle@debian.org--2005/apt--main--0--patch-72 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-73 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-74 Hebres translation update * bubulle@debian.org--2005/apt--main--0--patch-75 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-76 Correct the Hebrew translation for #306658 * bubulle@debian.org--2005/apt--main--0--patch-77 Update French man pages translations * bubulle@debian.org--2005/apt--main--0--patch-78 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-79 Correct syntax errors in Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-80 Revert changes to debian/changelog and debian/apt.cron.daily * bubulle@debian.org--2005/apt--main--0--patch-81 Portuguese translation update * daf@muse.19inch.net--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * daf@muse.19inch.net--2005/apt--main--0--patch-1 add Welsh translation * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9 * we only need to check once for xmlto * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1 Passage sous arch * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1 fix xml error --- a0732d0baf2d71a9360a2206b94236a0e3496097 diff --combined apt-pkg/pkgcachegen.cc index e90c1e50d,2340f97fd..04904057f --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@@ -26,8 -26,6 +26,8 @@@ #include #include +#include + #include #include @@@ -116,7 -114,7 +116,7 @@@ bool pkgCacheGenerator::MergeList(ListP pkgCache::PkgIterator Pkg; if (NewPackage(Pkg,PackageName) == false) - return _error->Error(_("Error occured while processing %s (NewPackage)"),PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) Progress->Progress(List.Offset()); @@@ -128,7 -126,7 +128,7 @@@ if (Version.empty() == true) { if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) - return _error->Error(_("Error occured while processing %s (UsePackage1)"), + return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); continue; } @@@ -149,11 -147,11 +149,11 @@@ if (Res == 0 && Ver->Hash == Hash) { if (List.UsePackage(Pkg,Ver) == false) - return _error->Error(_("Error occured while processing %s (UsePackage2)"), + return _error->Error(_("Error occurred while processing %s (UsePackage2)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occured while processing %s (NewFileVer1)"), + return _error->Error(_("Error occurred while processing %s (NewFileVer1)"), PackageName.c_str()); // Read only a single record and return @@@ -183,15 -181,15 +183,15 @@@ Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; if (List.NewVersion(Ver) == false) - return _error->Error(_("Error occured while processing %s (NewVersion1)"), + return _error->Error(_("Error occurred while processing %s (NewVersion1)"), PackageName.c_str()); if (List.UsePackage(Pkg,Ver) == false) - return _error->Error(_("Error occured while processing %s (UsePackage3)"), + return _error->Error(_("Error occurred while processing %s (UsePackage3)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occured while processing %s (NewVersion2)"), + return _error->Error(_("Error occurred while processing %s (NewVersion2)"), PackageName.c_str()); // Read only a single record and return @@@ -240,7 -238,7 +240,7 @@@ bool pkgCacheGenerator::MergeFileProvid pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName); if (Pkg.end() == true) - return _error->Error(_("Error occured while processing %s (FindPkg)"), + return _error->Error(_("Error occurred while processing %s (FindPkg)"), PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@@ -253,7 -251,7 +253,7 @@@ if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) { if (List.CollectFileProvides(Cache,Ver) == false) - return _error->Error(_("Error occured while processing %s (CollectFileProvides)"),PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str()); break; } } diff --combined cmdline/apt-get.cc index 54479e224,316bb7af9..3bafd42ba --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -58,7 -58,6 +58,7 @@@ #include #include #include +#include /*}}}*/ using namespace std; @@@ -542,7 -541,7 +542,7 @@@ bool ShowEssential(ostream &out,CacheFi } delete [] Added; - return ShowList(out,_("WARNING: The following essential packages will be removed\n" + return ShowList(out,_("WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList); } @@@ -863,7 -862,7 +863,7 @@@ bool InstallPackages(CacheFile &Cache,b const char *Prompt = _("Yes, do as I say!"); ioprintf(c2out, - _("You are about to do something potentially harmful\n" + _("You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] "),Prompt); c2out << flush; @@@ -993,7 -992,7 +993,7 @@@ cerr << _("Unable to correct missing packages.") << endl; return _error->Error(_("Aborting install.")); } - + _system->UnLock(); pkgPackageManager::OrderResult Res = PM->DoInstall(); if (Res == pkgPackageManager::Failed || _error->PendingError() == true) @@@ -1356,47 -1355,6 +1356,47 @@@ bool DoUpdate(CommandLine &CmdL return true; } /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false) + return _error->Error(_("We are not supposed to delete stuff, can't " + "start AutoRemover")); + + // do the actual work + pkgMarkUsed(Cache); + + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (! Cache[Pkg].Dirty() && + (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && + Cache[Pkg].Delete() == false)) + { + fprintf(stdout,"We could delete %s %d\n", + Pkg.Name(), Cache[Pkg].AutomaticRemove); + Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } + } + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) + { + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); + } + return true; +} // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@@ -1422,6 -1380,15 +1422,15 @@@ bool DoUpgrade(CommandLine &CmdL /* Install named packages */ bool DoInstall(CommandLine &CmdL) { + // Lock the list directory + FileFd Lock; + if (_config->FindB("Debug::NoLocking",false) == false) + { + Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); + if (_error->PendingError() == true) + return _error->Error(_("Unable to lock the list directory")); + } + CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) @@@ -1588,11 -1555,6 +1597,11 @@@ return _error->Error(_("Broken packages")); } + //if (_config->FindB("APT::Get::AutomaticRemove")) { + if (!DoAutomaticRemove(Cache)) + return false; + //} + /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@@ -1612,8 -1574,8 +1621,8 @@@ if (*J == 0) { List += string(I.Name()) + " "; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); @@@ -2457,7 -2419,6 +2466,7 @@@ void GetInitialize( _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@@ -2513,7 -2474,6 +2522,7 @@@ int main(int argc,const char *argv[] {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, + {0,"experimental-automatic-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, diff --combined configure.in index 12d3ecae7,767399b52..806e4b6ef --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.36") + AC_DEFINE_UNQUOTED(VERSION,"0.6.37") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@@ -181,9 -181,9 +181,6 @@@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) --dnl Check for the XML tools needed to build man pages --AC_PATH_PROG(XMLTO,xmlto) -- dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") diff --combined debian/changelog index 87e713d3d,57b746a56..7717705d3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,3 -1,36 +1,37 @@@ + apt (0.6.37) breezy; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 + - patch-66: Italian update + - patch-71: French update + - patch-73: Basque update + - patch-74: Hebrew update + - patch-76: Correct Hebrew translation (Closes: #306658) + - patch-77: French man page update + - patch-79: Correct syntax errors in Hebrew translation + - patch-81: Portuguese update + * Fix build of French man pages (now using XML, not SGML) + * Add Welsh translation from Dafydd Harries + (daf@muse.19inch.net--2005/apt--main--0--patch-1) + * Change debian/bugscript to use #!/bin/bash (Closes: #313402) ++ * Fix a incorrect example in the man-page (closes: #282918) + + -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 + + apt (0.6.36ubuntu1) breezy; urgency=low + + * make it possible to write a cache-control: no-cache header even if + no proxy is set to support transparent proxies (closes ubuntu: #10773) + + * Merge otavio@debian.org--2005/apt--fixes--0.6: + - Fix comment about the need of xmlto while building from Arch; + - Fix StatStore struct on cachedb.h to use time_t and then fix a compile + warning; + - Lock database at start of DoInstall routine to avoid concurrent + runs of install/remove and update commands (Closes: #194467) + - Fix warnings while compiling with GCC 4.0 compiler + + -- Michael Vogt Mon, 23 May 2005 11:57:53 +0200 + apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: @@@ -9,7 -42,7 +43,7 @@@ - apt-pkg/cdrom.cc: honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) - -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 apt (0.6.35) hoary; urgency=low diff --combined doc/apt_preferences.5.xml index 3e50bef8c,3e50bef8c..12b03196a --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@@ -183,7 -183,7 +183,7 @@@ belonging to any distribution whose Arc Package: * Pin: release a=unstable --Pin-Priority: 50 ++Pin-Priority: 500 The following record assigns a high priority to all package versions diff --combined doc/fr/makefile index 2b9278457,6544ee9e0..c0e7fa7ed --- a/doc/fr/makefile +++ b/doc/fr/makefile @@@ -8,6 -8,6 +8,48 @@@ include ../../buildlib/defaults.ma # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ -- apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 ++ apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ ++ apt-key.fr.8 ++ INCLUDES = apt.ent.fr - include $(SGML_MANPAGE_H) -include $(XML_MANPAGE_H) ++ ++doc: $(SOURCE) ++ ++$(SOURCE) :: % : %.xml $(INCLUDES) ++ echo Creating man page $@ ++ $(XMLTO) man $< ++ ++apt-cache.fr.8:: apt-cache.8 ++ cp $< $@ ++ ++apt-get.fr.8:: apt-get.8 ++ cp $< $@ ++ ++apt-cdrom.fr.8:: apt-cdrom.8 ++ cp $< $@ ++ ++apt.conf.fr.5:: apt.conf.5 ++ cp $< $@ ++ ++apt-config.fr.8:: apt-config.8 ++ cp $< $@ ++ ++sources.list.fr.5:: sources.list.5 ++ cp $< $@ ++ ++apt-sortpkgs.fr.1:: apt-sortpkgs.1 ++ cp $< $@ ++ ++apt-ftparchive.fr.1:: apt-ftparchive.1 ++ cp $< $@ ++ ++apt_preferences.fr.5:: apt_preferences.5 ++ cp $< $@ ++ ++apt-extracttemplates.fr.1:: apt-extracttemplates.1 ++ cp $< $@ ++ ++apt-key.fr.8:: apt-key.8 ++ cp $< $@ ++ ++ diff --combined po/he.po index ebab198ec,e2aea1c77..242155eff --- a/po/he.po +++ b/po/he.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-03-05 12:06+0100\n" + "POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@@ -303,7 -303,7 +303,7 @@@ msgid " " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" - " -o=? Set an arbitary configuration option" + " -o=? Set an arbitrary configuration option" msgstr "" #: ftparchive/apt-ftparchive.cc:757 @@@ -535,16 -535,16 +535,16 @@@ msgstr "לחבילות הבאות יש #: cmdline/apt-get.cc:325 #, c-format msgid "but %s is installed" - msgstr "אבל %s מותקן" + msgstr "אבל %s מותקנת" #: cmdline/apt-get.cc:327 #, c-format msgid "but %s is to be installed" - msgstr "" + msgstr "אבל %s הולכת להיות מותקנת" #: cmdline/apt-get.cc:334 msgid "but it is not installable" - msgstr "" + msgstr "אבל היא אינה ניתנת להתקנה" #: cmdline/apt-get.cc:336 msgid "but it is a virtual package" @@@ -572,7 -572,7 +572,7 @@@ msgstr "החבילות הבאות ×™×•× #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" - msgstr "החבילות הבאות מעוקבות:" + msgstr "החבילות הבאות מעובות:" #: cmdline/apt-get.cc:442 msgid "The following packages will be upgraded:" @@@ -596,6 -596,8 +596,8 @@@ msgid " "WARNING: The following essential packages will be removed\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" + "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" + "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" #: cmdline/apt-get.cc:575 #, c-format @@@ -637,6 -639,8 +639,8 @@@ msgstr "לא מצליח לתקן תלו #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" -+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" ++"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" ++"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" #: cmdline/apt-get.cc:658 msgid " Done" @@@ -656,7 -660,7 +660,7 @@@ msgid "WARNING: The following packages msgstr "החבילות הבאות ישודרגו:" #: cmdline/apt-get.cc:698 - msgid "Install these packages without verification? [y/N] " + msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@@ -726,7 -730,8 +730,8 @@@ msgid "Abort. msgstr "בטל." #: cmdline/apt-get.cc:886 - msgid "Do you want to continue? [Y/n] " + #, fuzzy + msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@@ -1359,7 -1364,7 +1364,7 @@@ msgid "Internal error adding a diversio msgstr "" #: apt-inst/deb/dpkgdb.cc:383 - msgid "The pkg cache must be initialize first" + msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 @@@ -1420,7 -1425,7 +1425,7 @@@ msgid " msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 - msgid "Wrong CD" + msgid "Wrong CD-ROM" msgstr "" #: methods/cdrom.cc:163 @@@ -2174,37 -2179,37 +2179,37 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:117 #, c-format - msgid "Error occured while processing %s (NewPackage)" + msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format - msgid "Error occured while processing %s (UsePackage1)" + msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format - msgid "Error occured while processing %s (UsePackage2)" + msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format - msgid "Error occured while processing %s (NewFileVer1)" + msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format - msgid "Error occured while processing %s (NewVersion1)" + msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format - msgid "Error occured while processing %s (UsePackage3)" + msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format - msgid "Error occured while processing %s (NewVersion2)" + msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@@ -2221,12 -2226,12 +2226,12 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:241 #, c-format - msgid "Error occured while processing %s (FindPkg)" + msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format - msgid "Error occured while processing %s (CollectFileProvides)" + msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260