The following commit has been merged in the master branch:
commit 1b9c0f6d82cd64a3aafcdc474a2aeeefd3bd41a3
Author: Raphaël Hertzog <[email protected]>
Date: Mon Jul 26 08:57:50 2010 +0200
dpkg-source: drop upstream debian directory before copying the debian one
in place
In source formats "2.0" and "3.0 (quilt)", make sure to remove the
upstream-provided debian directory before copying the debian-provided
version of that directory in place. Closes: #590297
diff --git a/debian/changelog b/debian/changelog
index cea02a0..9a1248c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,9 @@ dpkg (1.15.8) UNRELEASED; urgency=low
Also pass --rsyncable to make source packages more rsync friendly.
* Replace dpkg-source's tar ignore pattern "*~" with "*/*~" to avoid
matching on the top level directory. Closes: #588265
+ * In source formats "2.0" and "3.0 (quilt)", make sure to remove the
+ upstream-provided debian directory before copying the debian-provided
+ version of that directory in place. Closes: #590297
[ Guillem Jover ]
* Require gettext 0.18:
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index 26e628e..6c852ac 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -341,6 +341,7 @@ sub do_build {
}
# Copy over the debian directory
+ erasedir("$tmp/debian");
system("cp", "-a", "--", "$dir/debian", "$tmp/");
subprocerr(_g("copy of the debian directory")) if $?;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
