Received: (at submit) by bugs.debian.org; 17 May 1997 17:51:33 +0000
Received: (qmail 23703 invoked from network); 17 May 1997 17:51:32 -0000
Received: from icm.saechsisches-elbland.de (root@194.123.25.129)
  by master.debian.org with SMTP; 17 May 1997 17:51:29 -0000
Received: from eremit.lotte.sax.de ([194.123.25.146]) by icm.saechsisches-elbland.de
	 with esmtp (ident root using rfc1413) id m0wSnMm-00000kC
	(Debian Smail-3.2 1996-Jul-4 #2); Sat, 17 May 1997 19:34:00 +0200 (MET DST)
Received: by eremit.lotte.sax.de
	id m0wSmx1-0017naC
	(Debian Smail-3.2 1996-Jul-4 #2); Sat, 17 May 1997 19:07:23 +0200 (CEST)
Message-Id: <m0wSmx1-0017naC@eremit.lotte.sax.de>
Date: Sat, 17 May 1997 19:07:23 +0200 (CEST)
From: Heiko Schlittermann <heiko@lotte.sax.de>
Subject: dpkg: dpkg-gencontrol doesn't honour -DArchtecture=xxxx
To: submit@bugs.debian.org
Bcc:
X-Mailer: bug 2.93

Package: dpkg
Version: 1.4.0.8

Hello Klee,

as a former short time dpkg maintainer  ... I've triggered or introduced
(doesn't matter) the -D option to dpkg-gencontrol.  I needed this for
a multi platform build of the xforms package (coming as binary ``source''
only) for i386, m68k and for alpha.  

The support of -DArchitecture seems to be buggy, I've fixed it somewhat.
Probably it's a hack, but, at least for me, a necessary hack.  

#### dpkg-gencontrol
diff -u /usr/bin/dpkg-gencontrol /tmp/dpkg-gencontrol
--- /usr/bin/dpkg-gencontrol	Mon Feb  3 19:54:54 1997
+++ /tmp/dpkg-gencontrol	Sat May 17 18:56:10 1997
@@ -87,8 +87,10 @@
     }
 }
 
-$arch=`dpkg --print-architecture`;
-$? && &subprocerr("dpkg --print-architecture");
+$arch = $override{Architecture} or do {
+	$arch=`dpkg --print-architecture`;
+	$? && &subprocerr("dpkg --print-architecture");
+};
 $arch =~ s/\n$//;
 
 &parsechangelog;
@@ -206,7 +208,8 @@
 if (open(X,"< $fileslistfile")) {
     while (<X>) {
         s/\n$//;
-        next if m/^([-+0-9a-z.]+)_[^_]+_\w+\.deb / && $1 eq $oppackage;
+        next if m/^([-+0-9a-z.]+)_[^_]+_(\w+)\.deb / 
+		&& ($1 eq $oppackage) && ($2 eq $arch);
         print(Y "$_\n") || &syserr("copy old entry to new files list file");
     }
 } elsif ($! != ENOENT) {



-- System Information
Debian Release: 1.3
Kernel Version: Linux eremit 2.0.29 #3 Tue Apr 8 22:33:11 CEST 1997 i586 unknown

Versions of the packages dpkg depends on:
libc5	Version: 5.4.23-3
ncurses3.0	Version: 1.9.9e-1