From 93f0f211695dc8aa6b4cfc4063766f71dc074fc1 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 22 Dec 2016 18:43:37 +0000 Subject: [PATCH] dgit-maint-merge(7): Use debian/source/patch-header Closes:849120 Signed-off-by: Sean Whitton Signed-off-by: Ian Jackson --- debian/changelog | 1 + dgit-maint-merge.7.pod | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 00b651e9..3a2a8cd8 100644 --- 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. + * dgit-maint-merge(7): Use debian/source/patch-header. Closes:849120. Test suite: * Internal improvements. diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index dc5bfa34..245be4c9 100644 --- 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. -=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: @@ -263,6 +263,10 @@ See dgit(1), dgit(7) and dgit-maint-merge(7) for more information. =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, B, B, and B