Ubuntu dpkg 1.14.5ubuntu3
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.7
Date: Wed, 1 Aug 2007 12:11:40 +1000
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.14.5ubuntu3
Distribution: gutsy
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad@ubuntu.com>
Description:
dpkg - package maintenance system for Debian
dpkg-dev - package building tools for Debian
dselect - user tool to manage Debian packages
Changes:
dpkg (1.14.5ubuntu3) gutsy; urgency=low
.
* The previous triplettable mangling still left us with a GNU_TYPE
of i486-linux-gnulp, which was suboptimal. After mucking about
and coming to the conclusion that the current lookup tables just
weren't designed to handle two targets for the same CPU family,
implemented a hack in controllib.pl to DTRT for us for now.
* Add lpia to archtable for reference purposes and completeness.
Files:
a6887a52bb7390c1cef1b6f2f52a30fc 949 admin required dpkg_1.14.5ubuntu3.dsc
9b5c2960337aef51a7770e4625938cf9 5823299 admin required dpkg_1.14.5ubuntu3.tar.gz
Original-Maintainer: Dpkg Developers <team@dpkg.org>
diff -pruN 1.14.5ubuntu2/debian/archtable 1.14.5ubuntu3/debian/archtable
--- 1.14.5ubuntu2/debian/archtable 2007-07-31 15:46:22.000000000 +0100
+++ 1.14.5ubuntu3/debian/archtable 2007-08-01 03:09:27.000000000 +0100
@@ -13,6 +13,7 @@
#
# <ignore> <Debian name>
i486-linux-gnu i386
+i686-linux-gnulp lpia
ia64-linux-gnu ia64
alpha-linux-gnu alpha
x86_64-linux-gnu amd64
diff -pruN 1.14.5ubuntu2/debian/changelog 1.14.5ubuntu3/debian/changelog
--- 1.14.5ubuntu2/debian/changelog 2007-07-31 15:47:13.000000000 +0100
+++ 1.14.5ubuntu3/debian/changelog 2007-08-01 03:25:33.000000000 +0100
@@ -1,3 +1,14 @@
+dpkg (1.14.5ubuntu3) gutsy; urgency=low
+
+ * The previous triplettable mangling still left us with a GNU_TYPE
+ of i486-linux-gnulp, which was suboptimal. After mucking about
+ and coming to the conclusion that the current lookup tables just
+ weren't designed to handle two targets for the same CPU family,
+ implemented a hack in controllib.pl to DTRT for us for now.
+ * Add lpia to archtable for reference purposes and completeness.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 1 Aug 2007 12:11:40 +1000
+
dpkg (1.14.5ubuntu2) gutsy; urgency=low
* Include mapping from gnulp-linux-i386 to lpia in triplettable
diff -pruN 1.14.5ubuntu2/scripts/controllib.pl 1.14.5ubuntu3/scripts/controllib.pl
--- 1.14.5ubuntu2/scripts/controllib.pl 2007-07-31 15:45:32.000000000 +0100
+++ 1.14.5ubuntu3/scripts/controllib.pl 2007-08-01 03:11:28.000000000 +0100
@@ -231,6 +231,13 @@ sub gnutriplet_to_debtriplet($)
}
}
+ # This is sick and wrong, but dpkg-architecture just doesn't seem capable
+ # of handling this case on its own, with the current lookup tables:
+
+ if ($cpu eq "i386" && $os eq "gnulp-linux") {
+ $cpu = "i686";
+ }
+
return undef if !defined($cpu) || !defined($os);
return (split(/-/, $os, 2), $cpu);
}
diff -pruN 1.14.5ubuntu2/triplettable 1.14.5ubuntu3/triplettable
--- 1.14.5ubuntu2/triplettable 2007-07-31 15:45:05.000000000 +0100
+++ 1.14.5ubuntu3/triplettable 2007-08-01 03:08:42.000000000 +0100
@@ -4,7 +4,6 @@
#
# <Debian triplet> <Debian arch>
gnueabi-linux-arm armel
-gnulp-linux-i386 lpia
gnulp-linux-i686 lpia
gnu-linux-<cpu> <cpu>
gnu-kfreebsd-<cpu> kfreebsd-<cpu>
Reply to: