X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=2674d66dee14de119ff5559c52a381244362c02f;hp=0040604632c655974ebc37bcc20c3372043598f6;hb=134858eaf9df5e8e6f03c67b40c8ce4cc119b41e;hpb=4d7e3e06983596a42312de1b36c1c0098d2b5702 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 00406046..2674d66d 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