summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/unpack.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e94b788f5..cf87f5164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
- Reorder directory precedence to:
«dpkg-shlibdeps -l» > ENV{LD_LIBRARY_PATHS} > cross-multiarch >
DEFAULT_LIBRARY_PATH > ld.so.conf > DEFAULT_MULTILIB_PATH
+ * When upgrading, copy over the cached arch-qualified package name. This
+ fixes wrong output when cross-grading.
* Perl modules:
- Rename and deprecate Dpkg::Gettext _g function with new g_.
diff --git a/src/unpack.c b/src/unpack.c
index 23bdd20df..236d7ffb3 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -1239,6 +1239,7 @@ void process_archive(const char *filename) {
pkg->installed.maintainer= pkg->available.maintainer;
pkg->installed.source= pkg->available.source;
pkg->installed.arch = pkg->available.arch;
+ pkg->installed.pkgname_archqual = pkg->available.pkgname_archqual;
pkg->installed.installedsize= pkg->available.installedsize;
pkg->installed.version= pkg->available.version;
pkg->installed.origin = pkg->available.origin;