* merged with mainline

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 28ed22d1bd933280e267cd5e6c3330904b884a51..acf908ece9c5c123d81389dc6e031caf7a73efcc 100644 (file)
--- 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 4e75aa818dd4f8c4ba885134ec756d8f522c82f3..931e44ea04659a4a5b4ba3c11b0fa1b9b9e0581a 100644 (file)
--- 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 789c3d22874c1f94b71b2b6b2d63a3330f408932..2779f250142e6076c42945f184a69bad6c9736d4 100644 (file)
--- 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>