Package: apt Version: 0.7.20.2+lenny1 Severity: minor Tags: patch
Hi, I was checking apt-ftparchive to see if it would move packages (as stated on http://www.debian.org/doc/manuals/repository-howto/repository-howto.en.html#pools). I haven't found a way to do this, but along the way I've fixed a few typos in the package (source) comments, and a wording error in the man page. When I get my bug number I'll email the patch into the bug. thanks, kk -- Package-specific info: -- (no /etc/apt/preferences present) -- -- (/etc/apt/sources.list present, but not submitted) -- -- System Information: Debian Release: 5.0.3 APT prefers stable APT policy: (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.30.7-libre-fshoppe1 (SMP w/2 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages apt depends on: ii debian-archive-keyring 1:2009.01.31 GnuPG archive keys of the Debian a ii libc6 2.7-18 GNU C Library: Shared libraries ii libgcc1 1:4.3.2-1.1 GCC support library ii libstdc++6 4.3.2-1.1 The GNU Standard C++ Library v3 apt recommends no packages. Versions of packages apt suggests: pn apt-doc <none> (no description available) ii aptitude 0.4.11.11-1~lenny1 terminal-based package manager ii bzip2 1.0.5-1 high-quality block-sorting file co ii dpkg-dev 1.14.25 Debian package development tools ii lzma 4.43-14 Compression method of 7z format in ii python-apt 0.7.7.1+nmu1 Python interface to libapt-pkg ii synaptic 0.62.1+nmu1 Graphical package manager -- no debconf information
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: k...@kgoetz.id.au-20091130104507-60guv8hjnbecxmvh # target_branch: bzr+ssh://kgo...@bazaar.launchpad.net/%7Eubuntu-core-\ # dev/apt/ubuntu/ # testament_sha1: 18be449629346de76c83c76c674522f1be0fbf9c # timestamp: 2009-11-30 21:20:29 +1030 # base_revision_id: k...@outflux.net-20091014223105-wl7j3c3oi48j92zx # # Begin patch === modified file 'doc/apt-ftparchive.1.xml' --- doc/apt-ftparchive.1.xml 2009-08-26 10:21:54 +0000 +++ doc/apt-ftparchive.1.xml 2009-11-30 10:45:07 +0000 @@ -285,7 +285,7 @@ <varlistentry><term>Sources</term> <listitem><para> - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> === modified file 'ftparchive/apt-ftparchive.cc' --- ftparchive/apt-ftparchive.cc 2007-08-03 10:18:12 +0000 +++ ftparchive/apt-ftparchive.cc 2009-11-30 10:45:07 +0000 @@ -3,7 +3,7 @@ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### - apt-scanpackages - Efficient work-alike for dpkg-scanpackages + apt-ftparchive - Efficient work-alike for dpkg-scanpackages Let contents be disabled from the conf @@ -792,7 +792,7 @@ if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; - c1out << "Done Packages, Starting contents." << endl; + c1out << "Packages done, Starting contents." << endl; // Sort the contents file list by date string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); === modified file 'ftparchive/cachedb.cc' --- ftparchive/cachedb.cc 2009-07-30 15:34:48 +0000 +++ ftparchive/cachedb.cc 2009-11-30 10:45:07 +0000 @@ -69,7 +69,7 @@ // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ === modified file 'ftparchive/contents.cc' --- ftparchive/contents.cc 2007-11-30 12:00:15 +0000 +++ ftparchive/contents.cc 2009-11-30 10:45:07 +0000 @@ -13,7 +13,7 @@ removing the massive sort time overhead. By breaking all the pathnames into components and storing them - separately a space savings is realized by not duplicating the string + separately a space saving is realized by not duplicating the string over and over again. Ultimately this saving is sacrificed to storage of the tree structure itself but the tree structure yields a speed gain in the sorting and processing. Ultimately it takes about 5 seconds to === modified file 'ftparchive/multicompress.cc' --- ftparchive/multicompress.cc 2007-12-06 18:34:08 +0000 +++ ftparchive/multicompress.cc 2009-11-30 10:45:07 +0000 @@ -365,7 +365,7 @@ // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ === modified file 'ftparchive/writer.cc' --- ftparchive/writer.cc 2009-09-23 15:26:43 +0000 +++ ftparchive/writer.cc 2009-11-30 10:45:07 +0000 @@ -446,7 +446,7 @@ SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that - dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming + dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the status file and package file will remain similar. There are other transforms but optional is the only legacy one still in use for some lazy reason. */ # Begin bundle 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 +4zPg+fxdyRThQkLcPdBAA==