summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-01-20 09:32:56 -0700
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-01-24 23:48:41 +0000
commitecb373e0b66e4874eb8208bea857001a42001bc9 (patch)
tree3acb28f96a8536e2f89e7ba63415605bd57e6c1e /dgit-maint-merge.7.pod
parent54947007d3db8f79649e5329fb990856ad97d5ec (diff)
dgit-maint-merge(7): debian/source/patch-header not in format 1.0
Suggested-by: Matthew Vernon <matthew@debian.org> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod11
1 files changed, 8 insertions, 3 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 0040604..2674d66 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -300,9 +300,14 @@ A single combined diff, containing all the changes, follows.
=back
-Alternatively, this text could be added to README.source. However,
-this might distract from more important information present in the
-latter file.
+If you are using the version 1.0 source package format, this text
+should be added to README.source instead. The version 1.0 source
+package format ignores debian/source/patch-header.
+
+If you're using the version 3.0 (quilt) source package format, you
+could add this text to README.source instead of
+debian/source/patch-header, but this might distract from more
+important information present in README.source.
=head1 BUILDING AND UPLOADING