summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-12-19 09:29:49 +0000
committerSean Whitton <spwhitton@spwhitton.name>2016-12-19 09:29:49 +0000
commit568d065af3a870c52c0b670603fd8853e7cc2a14 (patch)
treefcb44fa6a5ed6989bf741505a3ef0ffaa23cdfca /dgit-maint-merge.7.pod
parentb803e131e26528e3c022bf0a2cf0860d25b8f75f (diff)
dgit-maint-merge(7): Converting existing packages
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod42
1 files changed, 41 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 240673a..5867a6b 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<dpkg-buildpackage
+-i\.git/ -I.git -S> and then unpacked the resultant source package.
+
+To achieve this, you might need to delete
+I<debian/source/local-options>. One way to have dgit check your
+progress is to run B<dgit build-source>.
+
=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<debian/gbp.conf> from "When upstream releases only
+tarballs", above.
+
+Then, either
=over 4