git-workflows: final delimiter

[dgit-junk.git] / git-workflows

diff --git a/git-workflows b/git-workflows
index 68b305ecd17468218d6982ee5032086e223e6acd..deb6e14c52501a417344ec39f5007ac7e6502c68 100644 (file)
--- a/git-workflows
+++ b/git-workflows
@@ -29,9 +29,10 @@ debian/patches
 
 -
 
 
 -
 

-gbp, gbp pq       

 quilt / dquilt    
 quilt / dquilt    

+Manual patch copying

 Manual patch editing
 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
+
+==================================================
+