summaryrefslogtreecommitdiff
path: root/dgit-maint-gbp.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-07-29 15:00:13 +0800
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-29 11:03:55 +0100
commit667143e23992efc090164cb105bad1dc4c116e5d (patch)
tree2f345bcd54b0b3699f810407932378309ad4f357 /dgit-maint-gbp.7.pod
parenta5a52f9261110b7b983d20b0a6ad04b6e69650ce (diff)
manpages: add references to pbuilder and cowbuilder
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-gbp.7.pod')
-rw-r--r--dgit-maint-gbp.7.pod46
1 files changed, 23 insertions, 23 deletions
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index b761296..29a712f 100644
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -58,8 +58,12 @@ where I<--allow-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 +71,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