* merged latest fixes from debian-sid

* apt-pkg/contrib/sha1.cc:
  - fix illegally casts of on-stack buffer to a type requiring more
    alignment than it has resulting in segfaults on sparc (Closes: #634696)
* apt-pkg/contrib/cdromutl.cc:
  - fix escape problem when looking for the mounted devices
* apt-pkg/contrib/strutl.{h,cc}, test/libapt/strutil_test.cc:
  - add new DeEscapeString() similar to DeQuoteString but
    unescape character escapes like \0XX and \xXX (plus added
    test)
* refresh po/*

* cmdline/apt-get.cc:
  - fix missing download progress in apt-get download
  - do not require unused partial dirs in 'source' (Closes: #633510)
  - buildconflicts effect all architectures
  - implement MultiarchCross for build-dep and source (Closes: #632221)
* cmdline/apt-key:
  - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
* debian/apt.postinst:
  - remove /etc/apt/secring.gpg if it is an empty file
* doc/apt-cache.8.xml:
  - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
* apt-pkg/policy.cc:
  - emit an error on unknown APT::Default-Release value (Closes: #407511)
* apt-pkg/aptconfiguration.cc:
  - ensure that native architecture is if not specified otherwise the
    first architecture in the Architectures vector
* apt-pkg/deb/deblistparser.cc:
  - Strip only :any and :native if MultiArch should be stripped as it is
    save to ignore them in non-MultiArch contexts but if the dependency
    is a specific architecture (and not the native) do not strip

1 files changed, 2 insertions, 0 deletions

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index c9eaa67d1..ae555df22 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -349,6 +349,8 @@ class pkgAcquire
     */
    bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
 
+   void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
+
    /** \brief Construct a new pkgAcquire. */
    pkgAcquire(pkgAcquireStatus *Log) __deprecated;
    pkgAcquire();