Ubuntu dpkg 1.16.0~ubuntu6
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.8
Date: Thu, 24 Mar 2011 17:04:47 -0700
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.0~ubuntu6
Distribution: natty
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Steve Langasek <steve.langasek@ubuntu.com>
Description:
dpkg - Debian package management system
dpkg-dev - Debian package development tools
dselect - Debian package management front-end
libdpkg-dev - Debian package management static library
libdpkg-perl - Dpkg perl modules
Closes: 619541
Launchpad-Bugs-Fixed: 739179 742124
Changes:
dpkg (1.16.0~ubuntu6) natty; urgency=low
.
* Dpkg/Shlibs.pm: we should explicitly prepend the appropriate multiarch
paths to our library search path. These would be picked up later on
anyway in the case of a native build, but for, e.g., bootstrapping a
cross-toolchain the needed multiarch paths aren't going to be found in
ld.so.conf.
* Cherry-pick fixes from upstream:
.
[ Raphaël Hertzog ]
* 7ea2064c46b77398a63d7f7a543ebcf08f7c74d2: Fix dpkg-source's regression
with empty patches (introduced while fixing 613023). Closes: #619541,
LP: #742124.
* 6a7a20c72325a57762e34f5dbb9f79ba73b5d496: Use the correct mtime when
installing a file with statoverrides. LP: #739179.
Checksums-Sha1:
d9f3aac6005048a3d669490ff4975d93ccb1a8f4 1943 dpkg_1.16.0~ubuntu6.dsc
1f5c043333b76b16f1958df8b52b588ce9ec94a2 5265631 dpkg_1.16.0~ubuntu6.tar.bz2
Checksums-Sha256:
d4cc0367cc9286f9be89cf19191a4f04c5095901069cbf1ad2d2ed31f27f999c 1943 dpkg_1.16.0~ubuntu6.dsc
1856ffdc60423f98291a4dd8208553d9341903e81acfd82a460c86a1c03d5519 5265631 dpkg_1.16.0~ubuntu6.tar.bz2
Files:
2edcf1969ba6be618f8d0833dda36b1e 1943 admin required dpkg_1.16.0~ubuntu6.dsc
9b958cc442b7b67e4e3584b6b879917f 5265631 admin required dpkg_1.16.0~ubuntu6.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.16.0~ubuntu5/debian/changelog 1.16.0~ubuntu6/debian/changelog
--- 1.16.0~ubuntu5/debian/changelog 2011-03-19 22:42:27.000000000 +0000
+++ 1.16.0~ubuntu6/debian/changelog 2011-03-25 00:05:13.000000000 +0000
@@ -1,3 +1,21 @@
+dpkg (1.16.0~ubuntu6) natty; urgency=low
+
+ * Dpkg/Shlibs.pm: we should explicitly prepend the appropriate multiarch
+ paths to our library search path. These would be picked up later on
+ anyway in the case of a native build, but for, e.g., bootstrapping a
+ cross-toolchain the needed multiarch paths aren't going to be found in
+ ld.so.conf.
+ * Cherry-pick fixes from upstream:
+
+ [ Raphaël Hertzog ]
+ * 7ea2064c46b77398a63d7f7a543ebcf08f7c74d2: Fix dpkg-source's regression
+ with empty patches (introduced while fixing 613023). Closes: #619541,
+ LP: #742124.
+ * 6a7a20c72325a57762e34f5dbb9f79ba73b5d496: Use the correct mtime when
+ installing a file with statoverrides. LP: #739179.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 24 Mar 2011 17:04:47 -0700
+
dpkg (1.16.0~ubuntu5) natty; urgency=low
* Cherry-pick 88b0c3043a651a422cd0c43c38ab6d553e2214ea from dpkg.git; adds
diff -pruN 1.16.0~ubuntu5/scripts/Dpkg/Shlibs.pm 1.16.0~ubuntu6/scripts/Dpkg/Shlibs.pm
--- 1.16.0~ubuntu5/scripts/Dpkg/Shlibs.pm 2011-03-01 22:07:14.000000000 +0000
+++ 1.16.0~ubuntu6/scripts/Dpkg/Shlibs.pm 2011-03-20 07:51:26.000000000 +0000
@@ -29,7 +29,8 @@ use Dpkg::Gettext;
use Dpkg::ErrorHandling;
use Dpkg::Shlibs::Objdump;
use Dpkg::Path qw(resolve_symlink canonpath);
-use Dpkg::Arch qw(debarch_to_gnutriplet get_build_arch get_host_arch);
+use Dpkg::Arch qw(debarch_to_gnutriplet debarch_to_multiarch
+ get_build_arch get_host_arch);
use constant DEFAULT_LIBRARY_PATH =>
qw(/lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64
@@ -39,6 +40,9 @@ use constant DEFAULT_LIBRARY_PATH =>
# cross-build or a build of a cross-compiler
my @crosslibrarypaths;
my $crossprefix;
+# And when we're not cross-compiling, be sure to pick up the multiarch paths
+my @multiarchpaths;
+my $multiarch;
# Detect cross compiler builds
if ($ENV{GCC_TARGET}) {
$crossprefix = debarch_to_gnutriplet($ENV{GCC_TARGET});
@@ -51,6 +55,7 @@ if ($ENV{DEB_TARGET_GNU_TYPE} and
# host for normal cross builds.
if (get_build_arch() ne get_host_arch()) {
$crossprefix = debarch_to_gnutriplet(get_host_arch());
+ $multiarch = debarch_to_multiarch(get_host_arch());
}
# Define list of directories containing crossbuilt libraries
if ($crossprefix) {
@@ -58,8 +63,11 @@ if ($crossprefix) {
"/$crossprefix/lib32", "/usr/$crossprefix/lib32",
"/$crossprefix/lib64", "/usr/$crossprefix/lib64";
}
+if ($multiarch) {
+ push @multiarchpaths, "/lib/$multiarch", "/usr/lib/$multiarch";
+}
-our @librarypaths = (DEFAULT_LIBRARY_PATH, @crosslibrarypaths);
+our @librarypaths = (@multiarchpaths, DEFAULT_LIBRARY_PATH, @crosslibrarypaths);
# Update library paths with LD_LIBRARY_PATH
if ($ENV{LD_LIBRARY_PATH}) {
diff -pruN 1.16.0~ubuntu5/scripts/Dpkg/Source/Patch.pm 1.16.0~ubuntu6/scripts/Dpkg/Source/Patch.pm
--- 1.16.0~ubuntu5/scripts/Dpkg/Source/Patch.pm 2011-03-09 23:21:49.000000000 +0000
+++ 1.16.0~ubuntu6/scripts/Dpkg/Source/Patch.pm 2011-03-24 23:24:31.000000000 +0000
@@ -543,7 +543,7 @@ sub apply {
# and remove .dpkg-orig files
my @files = keys %{$analysis->{'filepatched'}};
my $now = $opts{"timestamp"};
- $now ||= fs_time($files[0]) if $opts{"force_timestamp"};
+ $now ||= fs_time($files[0]) if $opts{"force_timestamp"} and scalar @files;
foreach my $fn (@files) {
if ($opts{"force_timestamp"}) {
utime($now, $now, $fn) || $! == ENOENT ||
diff -pruN 1.16.0~ubuntu5/src/archives.c 1.16.0~ubuntu6/src/archives.c
--- 1.16.0~ubuntu5/src/archives.c 2011-03-15 00:02:22.000000000 +0000
+++ 1.16.0~ubuntu6/src/archives.c 2011-03-24 23:40:07.000000000 +0000
@@ -535,10 +535,12 @@ tarobject(void *ctx, struct tar_entry *t
}
}
- if (nifd->namenode->statoverride)
+ if (nifd->namenode->statoverride) {
st = nifd->namenode->statoverride;
- else
+ st->mtime = ti->stat.mtime;
+ } else {
st = &ti->stat;
+ }
usenode = namenodetouse(nifd->namenode, tc->pkg);
usename = usenode->name + 1; /* Skip the leading '/'. */
Reply to: