summaryrefslogtreecommitdiff
path: root/scripts/Dpkg
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2010-07-26 08:57:50 +0200
committerRaphaël Hertzog <hertzog@debian.org>2010-07-26 08:57:50 +0200
commit1b9c0f6d82cd64a3aafcdc474a2aeeefd3bd41a3 (patch)
tree0870e3f6f7ff4cf9c2a700420b751c1ca54acade /scripts/Dpkg
parent23a78ee22e185a709fed901a8743836cdd954ae1 (diff)
downloaddpkg-1b9c0f6d82cd64a3aafcdc474a2aeeefd3bd41a3.tar.gz
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
Diffstat (limited to 'scripts/Dpkg')
-rw-r--r--scripts/Dpkg/Source/Package/V2.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 26e628eef..6c852ac32 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 $?;