summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-09-03 16:37:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-09-03 18:12:47 +0100
commit92547aaf083d493074b9c41649dda938efac1320 (patch)
treed2f699ac322ef1cf94a6001da983b51dc8e63233 /dgit
parent2286b68e5b63348a3e1d18b054152852801a5791 (diff)
dgit; Pass --include-removal to dpkg-source -b
Now, with single-debian-patch, we can still handle file removals. (This may fix other corner cases too.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit4
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit b/dgit
index f95e246..f96afdf 100755
--- a/dgit
+++ b/dgit
@@ -6059,7 +6059,7 @@ sub quilt_fixup_dpkgsource_singlepatch ($$$) {
rmtree("debian/patches");
- runcmd @dpkgsource, qw(-b .);
+ runcmd @dpkgsource, qw(--include-removal -b .);
changedir "..";
runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
rename srcfn("$upstreamversion", "/debian/patches"),
@@ -7046,7 +7046,7 @@ sub build_source {
}
# confess unless !!$made_split_brain == do_split_brain();
- my @cmd = (@dpkgsource, qw(-b --));
+ my @cmd = (@dpkgsource, qw(-b --include-removal --));
my $leafdir;
if (building_source_in_playtree()) {
$leafdir = 'work';