diff options
| author | Michael Vogt <egon@bottom> | 2006-07-27 00:36:59 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-07-27 00:36:59 +0200 |
| commit | dea2bea917c49647ce2eafa5e250842f387daa1d (patch) | |
| tree | 3767d28f681f4a3c1cac798a35be4e36e1b1563e | |
| parent | 1fa25c1f17a290e497a49cb310511b4b58c9c009 (diff) | |
| parent | 4577fda2b5f2b21f5400d10f4db71a8095f0df58 (diff) | |
* merged with mainline
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/apt-cache.8.xml | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 28ed22d1b..acf908ece 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -571,7 +571,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, if(comprExt.empty()) { // autoselect the compression method - if(FileExists("/usr/bin/bzip2")) + if(FileExists("/bin/bzip2")) CompressionExtension = ".bz2"; else CompressionExtension = ".gz"; diff --git a/debian/changelog b/debian/changelog index 4e75aa818..931e44ea0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.6.45) unstable; urgency=low (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) + * doc/apt-cache.8.xml: + - typo (Closes: #376408) * apt-pkg/deb/dpkgpm.cc: - make progress reporting more robust against multiline error messages (first half of a fix for #374195) @@ -17,6 +19,8 @@ apt (0.6.45) unstable; urgency=low Luis Rodrigo Gallardo Cruz for the patch * apt-inst/contrib/extracttar.cc: - fix for string mangling, closes: #373864 + * apt-pkg/acquire-item.cc: + - check for bzip2 in /bin (closes: #377391) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 789c3d228..2779f2501 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -277,7 +277,7 @@ Reverse Provides: <listitem><para>Select the file to store the source cache. The source is used only by <literal>gencaches</literal> and it stores a parsed version of the package information from remote sources. When building the package cache the - source cache is used to advoid reparsing all of the package files. + source cache is used to avoid reparsing all of the package files. Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem> </varlistentry> |