Ubuntu dpkg 1.16.10ubuntu3

[Ubuntu Merge-o-Matic <mom@ubuntu.com>]

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: Mon, 08 Jul 2013 08:05:57 -0600
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.10ubuntu3
Distribution: saucy
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad@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
Changes: 
 dpkg (1.16.10ubuntu3) saucy; urgency=low
 .
   * scripts/Dpkg/Shlibs/Objdump.pm: Adjust armel/armhf special-casing
     in dpkg-shlibdeps to try the new ELF ABI flags before arch tags.
Checksums-Sha1: 
 5ac2b56a3135a5fcf2f284e579a68412791e605c 1483 dpkg_1.16.10ubuntu3.dsc
 147fc4ecb14a08cf07e6756e9045038328a98704 3722328 dpkg_1.16.10ubuntu3.tar.xz
Checksums-Sha256: 
 4336b564c58a3cf20d41c80624ffeebbc2352549881cd1aa902ae3ddf1bbfa90 1483 dpkg_1.16.10ubuntu3.dsc
 b0131b37bf4e516dbb8f31f4a2718bd3e7a56d97a1d8c06fe4d85ac8b2a0dca0 3722328 dpkg_1.16.10ubuntu3.tar.xz
Files: 
 3ce3c57f450292060d1f7d9706eb4084 1483 admin required dpkg_1.16.10ubuntu3.dsc
 58416ff8d12f2f227ec05333014e91e8 3722328 admin required dpkg_1.16.10ubuntu3.tar.xz
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>

diff -pruN 1.16.10ubuntu2/debian/changelog 1.16.10ubuntu3/debian/changelog
--- 1.16.10ubuntu2/debian/changelog	2013-06-11 07:34:40.000000000 +0000
+++ 1.16.10ubuntu3/debian/changelog	2013-07-08 14:07:58.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.16.10ubuntu3) saucy; urgency=low
+
+  * scripts/Dpkg/Shlibs/Objdump.pm: Adjust armel/armhf special-casing
+    in dpkg-shlibdeps to try the new ELF ABI flags before arch tags.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 08 Jul 2013 08:05:57 -0600
+
 dpkg (1.16.10ubuntu2) saucy; urgency=low
 
   * Don't set -fstack-protector in dpkg-buildflags on arm64 (not yet
diff -pruN 1.16.10ubuntu2/scripts/Dpkg/Shlibs/Objdump.pm 1.16.10ubuntu3/scripts/Dpkg/Shlibs/Objdump.pm
--- 1.16.10ubuntu2/scripts/Dpkg/Shlibs/Objdump.pm	2013-03-18 09:49:20.000000000 +0000
+++ 1.16.10ubuntu3/scripts/Dpkg/Shlibs/Objdump.pm	2013-07-08 14:22:54.000000000 +0000
@@ -86,6 +86,30 @@ sub is_armhf {
     my ($file) = @_;
     my ($output, %opts, $pid, $res);
     my $hf = 0;
+    my $sf = 0;
+    $pid = spawn(exec => [ "readelf", "-h", "--", $file ],
+		 env => { "LC_ALL" => "C" },
+		 to_pipe => \$output, %opts);
+    while (<$output>) {
+	chomp;
+	if (/0x5000402/) {
+	    $hf = 1;
+	    last;
+	}
+	if (/0x5000202/) {
+	    $sf = 1;
+	    last;
+	}
+    }
+    close($output);
+    wait_child($pid, nocheck => 1);
+    if ($?) {
+	subprocerr("readelf");
+    }
+    if(($hf) || ($sf)) {
+	return $hf;
+    }
+    undef $output;
     $pid = spawn(exec => [ "readelf", "-A", "--", $file ],
 		 env => { "LC_ALL" => "C" },
 		 to_pipe => \$output, %opts);