-
Committer:
Package Import Robot
-
Author(s):
Adam Conrad
-
Date:
2013-03-22 12:09:02 UTC
-
mfrom:
(1.5.17 sid)
-
Revision ID:
package-import@ubuntu.com-20130322120902-dyucoloh4z5hmmuo
Tags: 1.16.10ubuntu1
* Merge from Debian unstable. Remaining changes:
- Change the multiarch downgrade version checks in prerm/postrm
from 1.16.2 to 1.16.0~ to reflect when multiarch landed in Ubuntu.
- Migrate dpkg multiarch conffile (and other multi-arch-related
conf settings) to the new DB with dpkg --add-architecture, but
keep a copy of the old conffile if it was modified.
- Out of paranoia, keep an option handler for foreign-architecture
that informs people that they need to scrub their config files
and upgrade, on the off chance that the above migration fails
for some reason (this mitigates the chances of leaving users with
a dpkg that fails to run due to a broken config).
- Add DPKG_UNTRANSLATED_MESSAGES environment check so that higher-level
tools can get untranslated dpkg terminal log messages while at the
same time having translated debconf prompts. This is useful for tools
that hide the dpkg terminal by default and use apport for bug
reporting with the untranslated error message.
- Apply patch from Steve McIntyre to special-case armhf/armel ELF
objects in Shlibs/Objdump.pm, so we don't get incorrect deps.
- lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
packages to the native arch instead of throwing an error, so that we
don't break on upgrade when there are unqualified names stored in
dpkg's own trigger database.
- Add logic to the postinst to `dpkg --add-architecture i386' on new
installs on amd64, and to also do so on upgrades from pre-conffile
Ubuntu versions, mimicking our previous behaviour with the conffile.
- Apply a workaround from mvo to consider RC packages as multiarch,
during the dpkg consistency checks. (see LP: 1015567 and 1057367).