Apply patch from mrvn to fix #228253; keep architecture in the

status file.

diff --git a/ChangeLog b/ChangeLog
index 61a3e5642c236c502596e5c79add9702975777ba..e9ae30f43f6fb57c608d78ccadaf9473fdb4ffd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  8 18:34:16 GMT 2004 Goswin Brederlow <brederlo@informatik.uni-tuebingen.de>
+
+  * lib/parse.c, main/processarc.c: Store Architecture in the status file
+  and don't remove it when processing.  This is a first step towards
+  multi-arch support in a future release of Debian.
+
 Mon Mar  8 18:28:07 GMT 2004 Robert Millan <rmh@debian.org>
 
   * archtable, configure.in, scripts/dpkg-architecture.pl: Update

diff --git a/THANKS b/THANKS
index 9c6f91894eb735a322c6bff4d3e14dfdc95c203a..3f35978aa69ef7ef469b026f02894817d896ac76 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Darren Stalder <torin@daft.com>
 David Huggins-Daines <dhd@debian.org>
 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
 Galen Hazelwood <galenh@debian.org>
+Goswin Brederlow <brederlo@informatik.uni-tuebingen.de>
 Guy Maor <maor@debian.org>
 Hartmut Koptein <koptein@naffel.de>
 Heiko Schlittermann <heiko@lotte.sax.de>

diff --git a/debian/changelog b/debian/changelog
index cacad212be2fce878fd992f436087483b703d5b0..9cc07f2cf8498bc4b1f17d67e96d70ad2ef6dfba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dpkg (1.10.19) unstable; urgency=low
   * Remove duplicated entries from ChangeLog.  Closes: #157437.
   * Fix dpkg-buildpackage when used with PGP.  Closes: #232916.
   * Update support for Debian FreeBSD.  Closes: #211566.
+  * Store Architecture in the status file.  Closes: #228253.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/lib/parse.c b/lib/parse.c
index 81c14714b8e6809f80463e867d337d400e93b61f..a3e13b6a9522b8d8263864320e7f51fa6b11200f 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -241,8 +241,6 @@ int parsedb(const char *filename, enum parsedbflags flags,
     if (flags & pdb_recordavailable)
       parsemustfield(NULL,filename,lno, warnto,warncount,&newpig,1,
                      (const char **)&newpifp->architecture, "architecture");
-    else if (newpifp->architecture && *newpifp->architecture)
-      newpifp->architecture= NULL;
 
     /* Check the Config-Version information:
      * If there is a Config-Version it is definitely to be used, but

diff --git a/main/processarc.c b/main/processarc.c
index c1d5669b7afbf6bad1f2646c9f39063a50596459..9de7e9deed5d3d54d90233ad95c216652ed8bb8b 100644 (file)
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -804,7 +804,7 @@ void process_archive(const char *filename) {
   pkg->installed.description= pkg->available.description;
   pkg->installed.maintainer= pkg->available.maintainer;
   pkg->installed.source= pkg->available.source;
-  pkg->installed.architecture= 0; /* This is irrelevant in the status file. */
+  pkg->installed.architecture= pkg->available.architecture;
   pkg->installed.installedsize= pkg->available.installedsize;
   pkg->installed.version= pkg->available.version;
   pkg->installed.origin = pkg->available.origin;