From 568d065af3a870c52c0b670603fd8853e7cc2a14 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 19 Dec 2016 09:29:49 +0000 Subject: [PATCH] dgit-maint-merge(7): Converting existing packages Signed-off-by: Sean Whitton --- dgit-maint-merge.7.pod | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 240673ae..5867a6b3 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -50,6 +50,10 @@ compress orig tarballs: =head1 INITIAL DEBIANISATION +This section explains how to start using this workflow with a new +package. It should be skipped when converting an existing package to +this workflow. + =head2 When upstream tags releases in git Suppose that the latest stable upstream release is 1.2.2, and this has @@ -172,6 +176,39 @@ branches: =back +=head1 CONVERTING AN EXISTING PACKAGE + +This section explains how to convert an existing Debian package to +this workflow. It should be skipped when debianising a new package. + +=head2 No existing git history + +=over 4 + + % dgit clone foo + % cd foo + +=back + +=head2 Existing git history using another workflow + +First, dump any existing patch queue: + +=over 4 + + % git rm -rf debian/patches + % git commit -m "drop existing quilt patch queue" + +=back + +Now you simply need to ensure that your git HEAD is dgit-compatible, +i.e., it is exactly what you would get if you ran B and then unpacked the resultant source package. + +To achieve this, you might need to delete +I. One way to have dgit check your +progress is to run B. + =head1 SOURCE PACKAGE CONFIGURATION =head2 debian/source/options @@ -275,7 +312,10 @@ Again, if you are using the version 1.0 source package format, replace =head2 When upstream releases only tarballs -Either +You will need the I from "When upstream releases only +tarballs", above. + +Then, either =over 4 -- 2.30.2