Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.

Closes: #646288.

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 69f27275076c157ed988170d8355c53a2f3cd1fa,31ae935254cfab7bcd39ab5e7a63f95ac7287d60..a03fa733ac0db9e5acb627813796022cf1ebf538
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,21 @@@
 -apt (0.8.16~exp13) UNRELEASED; urgency=low
 +apt (0.8.16~exp12ubuntu1) UNRELEASED; urgency=low
  
 +  [ Michael Vogt ]
 +  * merge from debian/experimental:
 +    - new ABI
 +
 +  [ Steve Langasek ]
 +  * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
 +    we resolve virtual package Breaks more effectively.  Thanks to Colin
 +    Watson for the patch.  Closes: #657695, LP: #922485.
 +  * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
 +    a signed short, because large upgrades can result in an overflow for
 +    core packages.  Thanks again to Colin Watson.  Closes: #657732,
 +    LP: #917173.
+   * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
+     Closes: #646288.
  
 - -- Steve Langasek <vorlon@debian.org>  Sat, 28 Jan 2012 21:23:06 +0000
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 28 Jan 2012 11:40:53 -0800
  
  apt (0.8.16~exp12) experimental; urgency=low