summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-12-22 18:43:37 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 13:08:32 +0000
commit93f0f211695dc8aa6b4cfc4063766f71dc074fc1 (patch)
treefa27b2ec9899ad5eb83567f712c3ba43e5e5e470
parente8df5638fc9abd8c502872b2a6f535de9ecf602f (diff)
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>
-rw-r--r--debian/changelog1
-rw-r--r--dgit-maint-merge.7.pod6
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 00b651e..3a2a8cd 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 dc5bfa3..245be4c 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<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit