X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit-junk.git;a=blobdiff_plain;f=git-workflows;h=deb6e14c52501a417344ec39f5007ac7e6502c68;hp=68b305ecd17468218d6982ee5032086e223e6acd;hb=14487f18a07a68935eeb45407fb16ff79ca6d312;hpb=d07325a664a3c6304e167a9a465c53e8256130c7

diff --git a/git-workflows b/git-workflows
index 68b305e..deb6e14 100644
--- a/git-workflows
+++ b/git-workflows
@@ -29,9 +29,10 @@ debian/patches
 
 -
 
-gbp, gbp pq	   
 quilt / dquilt	   
+Manual patch copying
 Manual patch editing
+Possibly gbp for building
 
 ==================================================
 
@@ -146,3 +147,51 @@ language-specific
 
 
 ==================================================
+
+Template debian/*
+No upstream files
+
+-
+
+d/patches, only:
+ changelog version => 
+ .orig tarball(s)     
+
+-
+
+Custom package-specific tooling to generate missing
+parts of debian/ from the template(s)
+
+==================================================
+
+Upstream files from a git tag,
+perhaps partially modified
+
+-
+
+Modifications directly in git
+plus further patches in d/patches
+
+changelog version => .orig tarball(s)     
+
+-
+
+format 1.0-with-diff
+debian/rules, not dpkg-source, applies debian/patches
+
+==================================================
+
+Modified upstream files
+plus debian/*
+no d/patches
+
+-
+
+Direct changes to upstream files
+
+-
+
+git-debcherry
+
+==================================================
+