diff options
Diffstat (limited to 'dgit-maint-gbp.7.pod')
| -rw-r--r-- | dgit-maint-gbp.7.pod | 63 |
1 files changed, 36 insertions, 27 deletions
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index 3c438ab..b8abd66 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -31,6 +31,15 @@ normally used with patches-unapplied. =head1 GIT CONFIGURATION +If you have configured an I<export-dir> in your gbp.conf, you should +tell dgit about it: + +=over 4 + + % git config --global dgit.default.build-products-dir /home/spwhitton/build-area + +=back + If you run =over 4 @@ -46,20 +55,24 @@ branch, never the dgit patches-applied branch. =head1 BUILDING -You can perform builds like this: +You can perform test builds like this: =over 4 - % dgit [--allow-dirty] gbp-build [OPTIONS] + % dgit [--include-dirty] gbp-build [OPTIONS] =back -where I<--allow-dirty> is needed for testing uncommitted changes, and +where I<--include-dirty> is needed for testing uncommitted changes, and I<OPTIONS> are any further options to be passed on to gbp-buildpackage(1). -When you are ready to build for upload, you will probably want to use -sbuild(1) or pbuilder(1), or do a source-only upload. Either +If you are doing a source-only upload, you do not need to prepare a +I<_source.changes>, as B<dgit push-source> will take of that on your +behalf. + +If you need to include binaries with your upload, you will probably +want to use sbuild(1), pbuilder(1) or cowbuilder(1): =over 4 @@ -67,37 +80,33 @@ sbuild(1) or pbuilder(1), or do a source-only upload. Either =back -or +replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate. -=over 4 +We use I<--rm-old-changes> to ensure that there is exactly one changes +file corresponding to this package, so we can be confident we're +uploading what we intend (though B<dgit push> will do some safety +checks). - % dgit --rm-old-changes gbp-build --git-pbuilder +Note that none of the commands in this section are required to upload +with dgit. You can invoke gbp-buildpackage(1), pbuilder(1), +cowbuilder(1) and sbuild(1) directly. However, the defaults for these +tools may leave you with something that dgit will refuse to upload +because it doesn't match your git HEAD. -=back +As a general rule, leave all signing and tagging to dgit. + +=head1 UPLOADING -or +Don't use I<--git-tag>: B<dgit push> will do this for you. To do a +source-only upload: =over 4 - % dgit --rm-old-changes --gbp build-source + % dgit --gbp push-source =back -We use I<--rm-old-changes> to ensure that there is exactly one changes -file corresponding to this package, so we can be confident we're -uploading what we intend (though B<dgit push> will do some safety -checks). - -Note that all of the commands in this section are not required to -upload with dgit. You can invoke gbp-buildpackage(1), pbuilder(1) and -sbuild(1) directly. However, the defaults for these tools may leave -you with something that dgit will refuse to upload because it doesn't -match your git HEAD. As a general rule, leave all signing and tagging -to dgit. - -=head1 UPLOADING - -Don't use I<--git-tag>: B<dgit push> will do this for you. To upload: +or if you need to include binaries, =over 4 @@ -106,7 +115,7 @@ Don't use I<--git-tag>: B<dgit push> will do this for you. To upload: =back This will push your git history to the dgit-repos, but you probably -want to follow it up with a push to alioth. +want to follow it up with a push to salsa. You will need to pass I<--overwrite> if the previous upload was not performed with dgit. |