The following commit has been merged in the master branch:
commit aacb1f1ec9aab9378fab10fb832a4337fb7852c4
Author: Colin Watson <[email protected]>
Date: Mon Feb 7 06:33:28 2011 +0100
On install for Ubuntu adjust the i386 GNU cpu name in cputable
Ubuntu builds their i386 architecture for i686 instead of i486 like
Debian does. This change helps them use an unmodified upstream source.
This should be considered a temporary measure until a better, more
generic implementation comes up, or is required for other derivatives,
but for now this will do.
Closes: #611741
Signed-off-by: Guillem Jover <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 9fedd98..e488faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ dpkg (1.16.0) UNRELEASED; urgency=low
* Do not segfault on “dpkg -i --no-act”.
* Add missing semicolon to the vsnprintf() compat declaration.
Thanks to Robert Millan. Closes: #612203
+ * On install for Ubuntu adjust the i386 GNU cpu name in cputable.
+ Thanks to Colin Watson <[email protected]>. Closes: #611741
[ Raphaël Hertzog ]
* Fail properly when debian/source/format is empty. Closes: #600854
diff --git a/debian/rules b/debian/rules
index b4b70b8..7276c86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,13 @@ install: check
cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+ # Ubuntu's «i386» architecture is built for i686 (the Debian default
+ # is i486).
+ sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
+ $(CURDIR)/debian/tmp/usr/share/dpkg/cputable
+endif
+
# Put together the dpkg and dselect packages
binary-arch: install
dh_testdir -a
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
