Ubuntu dpkg 1.16.7ubuntu6

[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, 01 Oct 2012 14:39:06 -0400
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.7ubuntu6
Distribution: quantal
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Barry Warsaw <barry@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: 683547
Launchpad-Bugs-Fixed: 1057886
Changes: 
 dpkg (1.16.7ubuntu6) quantal; urgency=low
 .
   [ Rapha�«l Hertzog ]
   * Fix dpkg-source regression in "3.0 (quilt)" source packages while
     unapplying patches that remove all files in a directory. Closes:
     #683547  (LP: #1057886)
Checksums-Sha1: 
 579394b404d2f38d02908d0b41b5d4f33f064a0f 2123 dpkg_1.16.7ubuntu6.dsc
 c318b5c5254d3a8f46bc910344587a2c7ceab132 3593916 dpkg_1.16.7ubuntu6.tar.xz
Checksums-Sha256: 
 4ef1b46101ea42db8311a142878a56a30c7b6828ef1ba8f8fe24c29b3cabd82e 2123 dpkg_1.16.7ubuntu6.dsc
 8056c27038eb742ab9c4ed4573fba50a3c48d4785d3aea05a30645d0488766f2 3593916 dpkg_1.16.7ubuntu6.tar.xz
Files: 
 a6475966edc839b4ea9f08685ba2cec9 2123 admin required dpkg_1.16.7ubuntu6.dsc
 c03f29c341360aa67f57b5aa6edeeb89 3593916 admin required dpkg_1.16.7ubuntu6.tar.xz
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>

diff -pruN 1.16.7ubuntu5/debian/changelog 1.16.7ubuntu6/debian/changelog
--- 1.16.7ubuntu5/debian/changelog	2012-09-29 00:41:19.000000000 +0000
+++ 1.16.7ubuntu6/debian/changelog	2012-10-01 18:41:31.000000000 +0000
@@ -1,3 +1,12 @@
+dpkg (1.16.7ubuntu6) quantal; urgency=low
+
+  [ Rapha�«l Hertzog ]
+  * Fix dpkg-source regression in "3.0 (quilt)" source packages while
+    unapplying patches that remove all files in a directory. Closes:
+    #683547  (LP: #1057886)
+
+ -- Barry Warsaw <barry@ubuntu.com>  Mon, 01 Oct 2012 14:39:06 -0400
+
 dpkg (1.16.7ubuntu5) quantal; urgency=low
 
   * Fix scoping issues in dpkg postinst, so we don't end up doing
diff -pruN 1.16.7ubuntu5/scripts/Dpkg/Source/Quilt.pm 1.16.7ubuntu6/scripts/Dpkg/Source/Quilt.pm
--- 1.16.7ubuntu5/scripts/Dpkg/Source/Quilt.pm	2012-09-26 19:48:34.000000000 +0000
+++ 1.16.7ubuntu6/scripts/Dpkg/Source/Quilt.pm	2012-10-01 18:38:08.000000000 +0000
@@ -29,6 +29,8 @@ use Dpkg::Vendor qw(get_current_vendor);
 use File::Spec;
 use File::Copy;
 use File::Find;
+use File::Path qw(make_path);
+use File::Basename;
 
 sub new {
     my ($this, $dir, %opts) = @_;
@@ -287,6 +289,7 @@ sub restore_quilt_backup_files {
             my $target = File::Spec->catfile($self->{'dir'}, $relpath_in_srcpkg);
             if (-s $_) {
                 unlink($target);
+                make_path(dirname($target));
                 unless (link($_, $target)) {
                     copy($_, $target) ||
                         syserr(_g("failed to copy %s to %s"), $_, $target);