-
Committer:
Package Import Robot
-
Author(s):
Jean-Louis Dupond, Jean-Louis Dupond, Colin Watson
-
Date:
2012-04-17 14:43:00 UTC
-
mfrom:
(169.1.1 oneiric-security)
-
Revision ID:
package-import@ubuntu.com-20120417144300-zcf9h35ol7m0p6pc
Tags: 0.8.16~exp5ubuntu13.3
[ Jean-Louis Dupond ]
* Backport fixes from precise verison of apt, to fix multiarch upgrades
from oneiric.
* apt-pkg/depcache.cc:
- prefer native providers over foreigns even if the chain is foreign.
(LP: #850264)
* cmdline/apt-get.cc:
- ignore foreign architectures if we check if a provides has only one
resolver as it's basically the same for the user, so no need to choose.
* apt-pkg/deb/deblistparser.cc:
- M-A: foreign packages provide for other archs, too
[ Colin Watson ]
* Include 0.8.16~exp5ubuntu13.1 patches.
* apt-pkg/algorithms.cc: Iterate Breaks the same way as Conflicts, so that
we resolve virtual package Breaks more effectively (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 (LP: #917173).