arch: Bump the GNU triplet cpu from i386 to i686

This matches toolchain changes.

Closes: #823619
Signed-off-by: Guillem Jover <guillem@debian.org>

cputable

@@ -14,7 +14,7 @@
 # Column 5 is the endianness (byte ordering in numbers)
 #
 # <Debian name>	<GNU name>	<config.guess regex>	<Bits>	<Endianness>
-i386		i586		(i[34567]86|pentium)	32	little
+i386		i686		(i[34567]86|pentium)	32	little
 ia64		ia64		ia64			64	little
 alpha		alpha		alpha.*			64	little
 amd64		x86_64		(amd64|x86_64)		64	little

debian/changelog

@@ -18,6 +18,9 @@ dpkg (1.18.7) UNRELEASED; urgency=medium
       truncated.
     Prompted by Manuel A. Fernandez Montecelo <mafm@debian.org>.
   * Colorize all fatal-error printing codepaths in libdpkg.
+  * Architecture support:
+    - Bump the GNU triplet cpu from i386 to i686 to match toolchain changes.
+      Thanks to Ben Hutchings <ben@decadent.org.uk>. Closes: #823619
   * Perl modules:
     - Relax dependency restrictions parsing to allow again sloppy spaces
       around versions, architectures and profile restrictions.

debian/rules

@@ -86,13 +86,6 @@ install: check
 
 	cd build-tree && $(MAKE) DESTDIR=$(D) install
 
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-	# Ubuntu's «i386» architecture is built for i686 (the Debian default
-	# is i586).
-	sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
-	        $(D)/usr/share/dpkg/cputable
-endif
-
 define dpkg-installmanl10n
 for f in `sed -e 's:\*:*/*:' debian/$(1).manpages`; do \
 	test -e $$f && \