apt-private/acqprogress.cc: reset color in apt update
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
EDSP doc: fix typo in Request stanza description
EDSP: bump protocol version to 0.5
EDSP: add Architecture(s) multi-arch fields to the Request stanza
EDSP: add Source field to Package stanzas
EDSP: add APT-Release field to Package stanzas
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
use free() instead of delete() when realloc is used

ContentsExtract::~ContentsExtract() needs to use free() because
Data got allocated via realloc()

Reported-By: clang -fsanitize=address -fno-omit-frame-pointer
Do not try to cast a pkgDepCache::Policy to a pkgCache

Fix incorrect cast in pkgDepCache::Policy::GetCandidateVer()

Reported-By: clang -fsanitize=address -fno-omit-frame-pointer
use free() instead of delete[] in debSrcRecordParser::~debSrcRecordParser

The Buffer was allocated using strndup() so we need to free it using
free() instead of delete[]
Fix uninitialized value

Reported-By: scan-build
Fix warning about uninitialized variable

Reported-By: clang++ -Werror
(try to) fix travis-ci build failures

dpkg on Ubuntu 12.04 does not seem to support parsing arch-specific
dependencies, so we try to detect if we face such a dpkg in the test.

In the other test the order depends on libdb, which changes per arch, so
we just run it through our sorting binary and be happy (hopefully).

Git-Dch: Ignore
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Merge EDSP 0.5 w/ multi-arch support for external solvers

"I am going to merge it tomorrow…"
if Resolver fails, do not continue even if not broken

This can happen if the request is already a well-formed request all by
itself (e.g. the package has no dependencies), but the resolver found
a reason to not accept it as solution. Our edsp 'dump' solver e.g.
shouldn't be able to trigger install, which it does otherwise.
check exit status of external solvers

Solvers are supposed to exit successfully even if they haven't found a
solution, but a solver which fails drastically (like e.g. segfaults)
should be detected and dealt with accordingly instead of ignored.
print error stack on failure of 'apt' solver

Git-Dch: ignore