diff options
Diffstat (limited to 'dgit-sponsorship.7.pod')
| -rw-r--r-- | dgit-sponsorship.7.pod | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 2e6f82d..1e070f2 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -30,7 +30,7 @@ This section is addressed to the sponsee: =head2 General You should prepare the package as if you were going -to upload it with C<dgit push-source> or C<dgit push> yourself. +to upload it with C<dgit push-source> or C<dgit push-built> yourself. For a straightforward NMU, consult L<dgit-nmu-simple(7)>. @@ -72,13 +72,14 @@ The git branch. =item * Any .orig tarballs which will be needed, -or sample git-archive(1) +or sample git-deborig(1), +git-archive(1) or gbp-buildpackage(1) command(s) to generate them. =item * -A sample dgit push command, containing +A sample dgit push-source command, containing any dgit --quilt=, --gbp or --dpm option needed =item * @@ -120,9 +121,11 @@ in their handover email. If there are any .origs that are not in the archive already, the sponsor will need them as part of the upload. -If the sponsee generated these tarballs with git-archive(1) +If the sponsee generated these tarballs with +git-deborig(1), git-archive(1) or gbp-buildpackage(1), -they can simply include a sample invocation of git-archive(1) +they can simply include a sample invocation of +git-deborig(1) or git-archive(1) or ensure that a suitable gbp.conf is present in the source package to generate the tarball. @@ -160,7 +163,7 @@ Some workflows involve git branches which are not natively dgit-compatible. Normally dgit will convert them as needed, during push. -Supply a sample "dgit push" command +Supply a sample "dgit push-source" command including any C<--gbp> (aka C<--quilt=gbp>), C<--dpm> (aka C<--quilt=dpm>), @@ -170,7 +173,7 @@ e.g. =over 4 - % dgit --gbp push + % dgit --gbp push-source =back @@ -236,7 +239,7 @@ C<dgit -wgf [--quilt=...] sbuild -A -C> or similar, to to the build, and then C<dgit -wgf [--quilt=...] push-source> or -C<dgit -wgf [--quilt=...] push> +C<dgit -wgf [--quilt=...] push-built> to do the upload. Check whether the sponsee made a debian/I<version> tag. @@ -256,13 +259,13 @@ should go on the sponsee's branch.) If this was the first upload done with dgit, you may need to pass -C<--overwrite> +C<--trust-changelog> to dgit. Alternatively, if this was the first ever dgit push of the package, you can pass C<--deliberately-not-fast-forward> -instead of C<--overwrite>. +instead of C<--trust-changelog>. This avoids introducing a new origin commit into the dgit view of the sponsee's git history @@ -306,11 +309,12 @@ formatted as a dgit branch. When you have finished your review and your tests, you can do the -dgit sbuild and -dgit push directly from the "sponsee" branch. +dgit push-source +(or dgit sbuild and dgit push-built) +directly from the "sponsee" branch. You will need to pass -C<--overwrite> +C<--trust-changelog> to dgit push for every successive upload. This disables a safety catch which would normally spot situations where changes are accidentally lost. |