From: Sean Whitton Date: Sun, 29 Jul 2018 07:00:13 +0000 (+0800) Subject: manpages: add references to pbuilder and cowbuilder X-Git-Tag: archive/debian/6.2~6 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=667143e23992efc090164cb105bad1dc4c116e5d manpages: add references to pbuilder and cowbuilder Signed-off-by: Sean Whitton --- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e4927684..6223e872 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -406,7 +406,8 @@ is a single debrebase stitch. =head1 BUILDING AND UPLOADING You can use dpkg-buildpackage(1) for test builds. When you are ready -to build for an upload, use B. +to build for an upload, use B, B or B. Upload with B or B. Remember to pass I<--new> if the package is new in the target suite. diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index b7612967..29a712f3 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 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 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 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 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 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 will do this for you. To upload: +or if you need to include binaries, =over 4 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 79d2a609..c20a2525 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -311,11 +311,11 @@ important information present in README.source. =head1 BUILDING AND UPLOADING -Use B, B, B, and B as detailed in dgit(1). If any command fails, dgit will provide -a carefully-worded error message explaining what you should do. If -it's not clear, file a bug against dgit. Remember to pass I<--new> -for the first upload. +Use B, B, B, B, B, and B as detailed in +dgit(1). If any command fails, dgit will provide a carefully-worded +error message explaining what you should do. If it's not clear, file +a bug against dgit. Remember to pass I<--new> for the first upload. As an alternative to B and friends, you can use a tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces that diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 34aaafff..ac57728c 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -65,6 +65,10 @@ Simply prepare your git tree in the usual way, and then: (Do not make any tags yourself: dgit push will do that.) +You may use B or B +instead of B; +see dgit(1) for the syntax of those subcommands. + The --overwrite option tells dgit that you are expecting that your git history is not a descendant of the history which dgit synthesised from the previous