summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2023-02-22 14:36:17 -0700
committerSean Whitton <spwhitton@spwhitton.name>2023-02-22 14:57:08 -0700
commitc40f3fd2f2af8573697f5d35eb5261c95283ead8 (patch)
treecc427d8f255b5fd430a9628602ecc65f07699556 /dgit
parent5ee4728272bac1bcbdd0b1e63e820dc56a371401 (diff)
dgit, dgit-maint-merge(7): Merge README.source text into gen. header
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit19
1 files changed, 16 insertions, 3 deletions
diff --git a/dgit b/dgit
index f305f48..3cbf8aa 100755
--- a/dgit
+++ b/dgit
@@ -6342,11 +6342,24 @@ sub quilt_fixup_git_singlepatch ($$$) {
if ($o2h) {
quiltify_make_dpkg_patch
$unapplied, $headref,
- 'dgit-changes', '', <<'END', '';
+ 'dgit-changes', '', <<END, '';
Debian changes
-The Debian delta in this package is represented by this one combined patch.
-The git history (e.g. from dgit clone) is the primary source representation.
+The Debian packaging of $package is maintained in git, using a workflow
+similar to the one described in dgit-maint-merge(7).
+The Debian delta is represented by this one combined patch; there isn't a
+patch queue that can be represented as a quilt series.
+
+A detailed breakdown of the changes is available from their canonical
+representation -- git commits in the packaging repository.
+For example, to see the changes made by the Debian maintainer in the first
+upload of upstream version 1.2.3, you could use:
+
+ % git clone https://git.dgit.debian.org/$package
+ % cd $package
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone $package`, rather than plain `git clone`.)
We don't use debian/source/options single-debian-patch because it has bugs.
Therefore, NMUs etc. may nevertheless have made additional patches.