X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=a4b169430040c02e93138ac3ddec9bbd223ba61e;hp=2976e136305c57a7d03006817d420b0a01b3e56e;hb=7bed50ebbcdf503896de776c0c70656b3dfeea7e;hpb=3b27de7dd10574f2e04df6a5fb89df792f369025 diff --git a/dgit.1 b/dgit.1 index 2976e136..a4b16943 100644 --- a/dgit.1 +++ b/dgit.1 @@ -199,11 +199,12 @@ You probably want to pass -A, to request those. Tagging, signing and actually uploading should be left to dgit push. .TP \fBdgit pbuilder\fR [\fIdebbuildopts\fP] -Like \fBdgit sbuild\fR, but uses -.B pbuilder -instead of -.BR sbuild , -and builds arch-independent packages by default. +Constructs the source package, uses +.B pbuilder +to do a binary build, and uses mergechanges to merge the source and +binary changes files. +The output is left in +.IR package \fB_\fR version \fB_multi.changes\fR. You should ensure that your dgit --build-products-dir setting matches your pbuilder --buildresult. @@ -211,7 +212,7 @@ your pbuilder --buildresult. The \fIdebbuildopts\fP are passed to pbuilder using its --debbuildopts option. If you want to pass other options to pbuilder, use the \fB--pbuilder:\fR dgit option as described below -(recalling that dgit options should appear between \fBdgit\fR and +(remember that dgit options should appear between \fBdgit\fR and \fBpbuilder\fR). You should ensure that in your pbuilderrc you do @@ -876,14 +877,20 @@ Note that \fBdgit push-source\fR will always find the right .changes, regardless of this option. .TP .BI --build-products-dir= directory -Specifies where to find the built files to be uploaded. -By default, dgit looks in the parent directory +Specifies where to find and create tarballs, binry packages, +source packages, .changes files, and so on. + +By default, dgit uses the parent directory .RB ( .. ). -Also see the +Changing this setting may necessitate +moving .orig tarballs to the new directory, +so it is probably best to +use the .BI dgit.default.build-products-dir -configuration option -(which this command line option overrides). +configuration setting +(see CONFIGURATION, below) +which this command line option overrides). .TP .BI --no-rm-on-error Do not delete the destination directory if clone fails.