[Reproducible-commits] [dpkg] 19/30: arch: Bump the GNU triplet cpu from i386 to i686

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 56799b5381710a15386d584d7dbd18f4daf3e234
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue May 3 00:53:25 2016 +0200

    arch: Bump the GNU triplet cpu from i386 to i686
    
    This matches toolchain changes.
    
    Closes: #823619
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 cputable         | 2 +-
 debian/changelog | 3 +++
 debian/rules     | 7 -------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/cputable b/cputable
index 2177200..2088d8e 100644
--- a/cputable
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 1b55c48..57c688e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.18.7) UNRELEASED; urgency=medium
       truncated.
     Prompted by Manuel A. Fernandez Montecelo <mafm at 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 at decadent.org.uk>. Closes: #823619
   * Perl modules:
     - Relax dependency restrictions parsing to allow again sloppy spaces
       around versions, architectures and profile restrictions.
diff --git a/debian/rules b/debian/rules
index 5d515e8..146f3c2 100755
--- a/debian/rules
+++ b/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 && \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git