Bug#216695: dpkg-architecture needs a small change for hurd-i386

[Santiago Vila <sanvila@unex.es>]

Package: dpkg-dev
Tags: patch

The hurd-i386 architecture is Intel based, like i386, so the
canonicalizing rewrite which is done so that i486-linux becomes
i386-linux and so on should be done to gnu architectures as well so
that i586-gnu becomes i386-gnu, etc.

Patch follows:

--- dpkg-architecture.orig	2003-09-20 03:06:39.000000000 +0200
+++ dpkg-architecture	2003-10-20 14:26:52.000000000 +0200
@@ -98,7 +98,7 @@
 sub rewrite_gnu {
 	local ($_) = @_;

-	s/(?:i386|i486|i586|i686|pentium)(.*linux)/i386$1/;
+	s/(?:i386|i486|i586|i686|pentium)(.*linux|.*gnu)/i386$1/;
 	s/ppc/powerpc/;
 	s/openbsd([\d\.]+$)/openbsd/;
 	s/-unknown-/-/;


Without this patch, compiling the simple GNU hello package gives these
warnings:

dpkg-architecture: warning: Unknown gcc system type i586-gnu, falling back to
  default (native compilation)
dpkg-architecture: warning: Specified GNU system type i386-gnu does not match
  gcc system type i586-gnu.

when using the most recent gcc compiler for the Hurd, which is now i586-based.

Thanks.