diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-01-27 09:13:38 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-01-27 09:13:38 -0700 |
| commit | 1c974dcb26adc967020b5aaa77de14724fad834b (patch) | |
| tree | c6f26a6bbd3d119173e0fad43ed06b5e19adaa58 /dgit-maint-merge.7.pod | |
| parent | 720e6334db6f619765cf037eb8517b165e77e80f (diff) | |
| parent | 4210fa385422c0c5c35f9285410d734d9442430b (diff) | |
Merge tag 'debian/4.3' into dgit/stretch-backports
dgit release 4.3 for unstable (sid) [dgit]
[dgit distro=debian]
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 11 |
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 |