Add support for the new Hurd-style i386-gnu triplets; rather than hacking

this onto the Linux support, I'm deliberately doing it separately so when
they change it again, we don't have to unbreak things.

diff --git a/ChangeLog b/ChangeLog
index 0db258fbf61718dc4a7591dcd286fb4c450e9c82..4e5c76c61ce5afd995b413161c623e2b7ae204f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 27 19:47:37 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/dpkg-architecture.pl (rewrite_gnu): Add a new regexp for
+  parsing i386-gnu style triplets on the Hurd.
+
 Tue Apr 27 19:23:01 BST 2004 Scott James Remnant <scott@netsplit.com>
 
   * main/dpkg.8: Correct reference to non-existant --force-reinstreq

diff --git a/debian/changelog b/debian/changelog
index 0537b8a149eed35fa1b5e4d7a16414190fd954c9..8f2648516aff9262296ab9fcff766e52d0af0c48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.22) unstable; urgency=low
 
   * Add amd64 support. Closes: #238483, #241938.
+  * Add i?86-gnu support.  Closes: #216695, #236331.
   * Stop hardcoding the list of manual page languages in debian/rules,
     so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
   * Correct dpkg manpage to refer to --force-remove-reinstreq instead of

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index f388b6227042f2c646b28a8edf226328ea6048e3..baaac04ca592dc3aa0be781e00a152474b86a2d2 100755 (executable)
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -100,6 +100,7 @@ sub rewrite_gnu {
        local ($_) = @_;
 
        s/(?:i386|i486|i586|i686|pentium)(.*linux)/i386$1/;
+       s/(?:i386|i486|i586|i686|pentium)(.*gnu)/i386$1/;
        s/ppc/powerpc/;
        s/openbsd([\d\.]+$)/openbsd/;
        s/-unknown-/-/;