From: Michael Vogt Date: Wed, 30 Nov 2005 15:34:28 +0000 (+0000) Subject: * merged with apt--mvo X-Git-Tag: 0.7.21~284^2~38 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/39c7baef5ef2fe40b539833714913bd8a85279cd * merged with apt--mvo Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d * bubulle@debian.org--2005/apt--main--0--patch-130 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-131 Simplified Chinese translation update * bubulle@debian.org--2005/apt--main--0--patch-132 Completed Simplified Chinese translation * bubulle@debian.org--2005/apt--main--0--patch-133 Merge with Michael AND update PO files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90 * merged the sources.list.d patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93 * sources.list.d documented * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94 * pkgDirStream has (slightly) better extract support now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95 * merge fix for #339533 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97 * some more debug output * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98 * ABI change: merged more flexible pkgAcquireFile code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99 * merged http download limit for apt (#146877) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100 * applied parts of the string speedup patch from debian #319377 (ABI change) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101 * fix for #340448 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107 * merged with bubulle --- 39c7baef5ef2fe40b539833714913bd8a85279cd diff --cc apt-pkg/acquire-item.h index 323dff256,c34b5ef69..58c915344 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@@ -861,28 -225,13 +861,40 @@@ class pkgAcqFile : public pkgAcquire::I virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - // If DestFilename is empty, download to DestDir/ if - // DestDir is non-empty, $CWD/ otherwise. If - // DestFilename is NOT empty, DestDir is ignored and DestFilename - // is the absolute name to which the file should be downloaded. + /** \brief Create a new pkgAcqFile object. + * + * \param Owner The pkgAcquire object with which this object is + * associated. + * + * \param URI The URI to download. + * + * \param MD5 The md5sum of the file to download, if it is known; + * otherwise "". + * + * \param Size The size of the file to download, if it is known; + * otherwise 0. + * + * \param Desc A description of the file being downloaded. + * + * \param ShortDesc A brief description of the file being + * downloaded. ++ * ++ * \param DestDir The directory the file should be downloaded into. ++ * ++ * \param DestFilename The filename+path the file is downloaded to. ++ * ++ * ++ * If DestFilename is empty, download to DestDir/ if ++ * DestDir is non-empty, $CWD/ otherwise. If ++ * DestFilename is NOT empty, DestDir is ignored and DestFilename ++ * is the absolute name to which the file should be downloaded. + */ - pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size, - string Desc,string ShortDesc); ++ + pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size, + string Desc, string ShortDesc, + const string &DestDir="", const string &DestFilename=""); }; +/** @} */ + #endif diff --cc apt-pkg/pkgcachegen.h index 6ab8594d9,9a729eea4..fae1a60a6 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@@ -54,11 -53,9 +54,11 @@@ class pkgCacheGenerato // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); + bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); - unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next); + unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); + map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); public: diff --cc configure.in index f85afae5f,18cdbfdde..46dd24658 --- 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.42.3exp1") -AC_DEFINE_UNQUOTED(VERSION,"0.6.43") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.43exp1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index d9ceff5ea,86ca0135d..a065fd00e --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,30 +1,37 @@@ - apt (0.6.42.3exp1) experimental; urgency=low -apt (0.6.43.1) unstable; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-133: - * fr.po: Completed to 510 strings - - -- Michael Vogt Wed, 30 Nov 2005 10:14:02 +0100 ++apt (0.6.43exp1) experimental; urgency=low + + * added support for package index diffs + * added support for i18n of the package descriptions + * synced with the apt--debian-sid--0 branch + * build from mvo@debian.org--2005/apt--debian-experimental--0 + (from http://people.debian.org/~mvo/arch) + * fix bug in apt-cache when displaying the record (closes: #334887) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) ++ * changed abi version to 3.12 + + -- Michael Vogt Sun, 13 Nov 2005 13:33:57 +0100 + apt (0.6.43) unstable; urgency=medium + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: + * zh_CN.po: Completed to 510 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + * make pkgDirStream (a bit) more complete + * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) + (closes: #339533) + * pkgAcqFile is more flexible now (closes: #57091) + * support a download rate limit for http (closes: #146877) + * included lots of the speedup changes from #319377 + * add stdint.h to contrib/md5.h (closes: #340448) + * ABI change, library name changed (closes: #339147) + * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) + * switch to libdb4.3 in build-depends + + -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: diff --cc methods/http.cc index dbf2d1b43,dc3f0b763..cb63ada49 --- a/methods/http.cc +++ b/methods/http.cc @@@ -58,7 -58,12 +58,11 @@@ unsigned long PipelineDepth = 10 unsigned long TimeOut = 120; bool Debug = false; -- + unsigned long CircleBuf::BwReadLimit=0; + unsigned long CircleBuf::BwTickReadData=0; + struct timeval CircleBuf::BwReadTick={0,0}; + const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ diff --cc po/apt-all.pot index 541a90df4,311549b4f..1057afa5e --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-10-17 19:31+0200\n" -"POT-Creation-Date: 2005-11-30 08:37+0100\n" ++"POT-Creation-Date: 2005-11-30 11:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -20,9 -20,9 +20,9 @@@ msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 - #: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 ++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "" @@@ -96,72 -88,72 +96,72 @@@ msgstr " msgid "Package file %s is out of sync." msgstr "" - #: cmdline/apt-cache.cc:1293 -#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "" - #: cmdline/apt-cache.cc:1447 -#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "" - #: cmdline/apt-cache.cc:1524 -#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "" - #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" - #: cmdline/apt-cache.cc:1532 -#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins - #: cmdline/apt-cache.cc:1544 -#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" - #: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version - #: cmdline/apt-cache.cc:1577 -#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "" - #: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version - #: cmdline/apt-cache.cc:1584 -#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" - #: cmdline/apt-cache.cc:1594 -#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables - #: cmdline/apt-cache.cc:1603 -#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" - #: cmdline/apt-cache.cc:1618 -#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr "" - #: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 ++#: cmdline/apt-cache.cc:1707 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" - #: cmdline/apt-cache.cc:1720 -#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1714 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -1539,7 -1543,7 +1552,7 @@@ msgstr " msgid "Server closed the connection" msgstr "" --#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 ++#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:471 msgid "Read error" msgstr "" @@@ -1551,7 -1555,7 +1564,7 @@@ msgstr " msgid "Protocol corruption" msgstr "" --#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 ++#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:510 msgid "Write error" msgstr "" @@@ -1605,7 -1609,7 +1618,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" - #: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 -#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1735,79 -1739,79 +1748,87 @@@ msgstr " msgid "Read error from %s process" msgstr "" - #: methods/http.cc:345 -#: methods/http.cc:381 ++#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" - #: methods/http.cc:491 -#: methods/http.cc:527 ++#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" - #: methods/http.cc:499 -#: methods/http.cc:535 ++#: methods/http.cc:529 msgid "Bad header line" msgstr "" - #: methods/http.cc:518 methods/http.cc:525 -#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" - #: methods/http.cc:554 -#: methods/http.cc:590 ++#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" - #: methods/http.cc:569 -#: methods/http.cc:605 ++#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" - #: methods/http.cc:571 -#: methods/http.cc:607 ++#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" - #: methods/http.cc:595 -#: methods/http.cc:631 ++#: methods/http.cc:625 msgid "Unknown date format" msgstr "" - #: methods/http.cc:742 -#: methods/http.cc:778 ++#: methods/http.cc:772 msgid "Select failed" msgstr "" - #: methods/http.cc:747 -#: methods/http.cc:783 ++#: methods/http.cc:777 msgid "Connection timed out" msgstr "" - #: methods/http.cc:770 -#: methods/http.cc:806 ++#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" - #: methods/http.cc:798 -#: methods/http.cc:837 ++#: methods/http.cc:831 msgid "Error writing to file" msgstr "" - #: methods/http.cc:823 -#: methods/http.cc:865 ++#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" - #: methods/http.cc:837 -#: methods/http.cc:879 ++#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" - #: methods/http.cc:839 -#: methods/http.cc:881 ++#: methods/http.cc:875 msgid "Error reading from server" msgstr "" - #: methods/http.cc:1070 -#: methods/http.cc:1112 ++#: methods/http.cc:1106 msgid "Bad header data" msgstr "" - #: methods/http.cc:1087 -#: methods/http.cc:1129 ++#: methods/http.cc:1123 msgid "Connection failed" msgstr "" - #: methods/http.cc:1178 -#: methods/http.cc:1220 ++#: methods/http.cc:1214 msgid "Internal error" msgstr "" ++#: methods/rred.cc:219 ++msgid "Could not patch file" ++msgstr "" ++ ++#: methods/rsh.cc:330 ++msgid "Connection closed prematurely" ++msgstr "" ++ #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@@ -1817,7 -1821,7 +1838,7 @@@ msgid "Couldn't make mmap of %lu bytes" msgstr "" - #: apt-pkg/contrib/strutl.cc:984 -#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@@ -2014,72 -2018,72 +2035,72 @@@ msgstr " msgid "Problem syncing the file" msgstr "" - #: apt-pkg/pkgcache.cc:135 -#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "" - #: apt-pkg/pkgcache.cc:141 -#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "" - #: apt-pkg/pkgcache.cc:146 -#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "" - #: apt-pkg/pkgcache.cc:151 -#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:153 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" - #: apt-pkg/pkgcache.cc:156 -#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "" - #: apt-pkg/pkgcache.cc:227 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "" - #: apt-pkg/pkgcache.cc:227 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "" - #: apt-pkg/pkgcache.cc:227 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "" - #: apt-pkg/pkgcache.cc:228 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "" - #: apt-pkg/pkgcache.cc:228 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "" - #: apt-pkg/pkgcache.cc:228 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "" - #: apt-pkg/pkgcache.cc:229 -#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "" - #: apt-pkg/pkgcache.cc:240 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "" - #: apt-pkg/pkgcache.cc:240 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "" - #: apt-pkg/pkgcache.cc:240 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "" - #: apt-pkg/pkgcache.cc:241 -#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "" - #: apt-pkg/pkgcache.cc:241 -#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "" @@@ -2135,7 -2139,7 +2156,7 @@@ msgstr " msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@@ -2214,12 -2218,12 +2235,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" - #: apt-pkg/init.cc:122 -#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:123 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" - #: apt-pkg/init.cc:138 -#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:139 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2351,32 -2341,31 +2372,32 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 +#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 - #: apt-pkg/acquire-item.cc:1336 ++#: apt-pkg/acquire-item.cc:1339 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:1150 -#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1147 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:1203 -#: apt-pkg/acquire-item.cc:778 ++#: apt-pkg/acquire-item.cc:1206 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:1239 -#: apt-pkg/acquire-item.cc:814 ++#: apt-pkg/acquire-item.cc:1242 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:1326 -#: apt-pkg/acquire-item.cc:901 ++#: apt-pkg/acquire-item.cc:1329 msgid "Size mismatch" msgstr "" @@@ -2526,11 -2513,7 +2547,3 @@@ msgstr " #, c-format msgid "Removed with config %s" msgstr "" - - #: methods/rred.cc:219 - msgid "Could not patch file" - msgstr "" -- --#: methods/rsh.cc:330 --msgid "Connection closed prematurely" --msgstr ""