dgit-maint-merge(7): Use debian/source/patch-header

Closes:849120

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 00b651e911515495b4d09466576e74e5b34e7c6f..3a2a8cd8c0f2b267e1f5b5151131122ac1a126e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ dgit (3.0~) unstable; urgency=medium
 
   Docuentation [Sean Whitton]:
   * dgit-sponsorship(7): Use --no-dep14tag.  Closes:#849105.
 
   Docuentation [Sean Whitton]:
   * dgit-sponsorship(7): Use --no-dep14tag.  Closes:#849105.

+  * dgit-maint-merge(7): Use debian/source/patch-header.  Closes:849120.

 
   Test suite:
   * Internal improvements.
 
   Test suite:
   * Internal improvements.

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index dc5bfa34043dd1dac121f416b3d2bc3ce444c0ad..245be4c937a744cffd16bdc7a8f709b056cd1ce3 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -238,7 +238,7 @@ source:
 You don't need to create this file if you are using the version 1.0
 source package format.
 
 You don't need to create this file if you are using the version 1.0
 source package format.
 

-=head2 Sample text for README.source
+=head2 Sample text for debian/source/patch-header

 
 It is a good idea to explain how a user can obtain a break down of the
 changes to the upstream source:
 
 It is a good idea to explain how a user can obtain a break down of the
 changes to the upstream source:


@@ -263,6 +263,10 @@ See dgit(1), dgit(7) and dgit-maint-merge(7) for more information.
 
 =back
 
 
 =back
 

+Alternatively, this text could be added to README.source. However,
+this might distract from more important information present in the
+latter file.
+

 =head1 BUILDING AND UPLOADING
 
 Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit
 =head1 BUILDING AND UPLOADING
 
 Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit