changelog: start 2.12~

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index a26f6bc0dea545af6d7742829fd6303f7d4e27e3..33d24a95a11b831b8712d9859cfeba1e47a0c9e7 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -38,8 +38,8 @@ lb l.
 dgit-user(7)   for users: editing, building and sharing packages
 dgit-nmu-simple(7)     for DDs: doing a straightforward NMU
 dgit-maint-native(7)   for maintainers of Debian-native packages
 dgit-user(7)   for users: editing, building and sharing packages
 dgit-nmu-simple(7)     for DDs: doing a straightforward NMU
 dgit-maint-native(7)   for maintainers of Debian-native packages

-dgit-maint-merge(7)    for maintainers: using a merging git workflow
-dgit-maint-gbp(7)      for maintainers: using git-buildpackage
+dgit-maint-merge(7)    for maintainers who want a pure git workflow
+dgit-maint-gbp(7)      for maintainers already using git-buildpackage

 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE
 .LP
 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE
 .LP


@@ -73,6 +73,11 @@ for the distro to which
 .I suite
 belongs.
 
 .I suite
 belongs.
 

+.I suite
+may be a combination of several underlying suites in the form
+.IR mainsuite \fB,\fR subsuite ...;
+see COMBINED SUITES in dgit(7).
+

 For your convenience, the
 .B vcs-git
 remote will be set up from the package's Vcs-Git field, if there is
 For your convenience, the
 .B vcs-git
 remote will be set up from the package's Vcs-Git field, if there is


@@ -90,6 +95,7 @@ then dgit fetch defaults to
 .IR suite ;
 otherwise it parses debian/changelog and uses the suite specified
 there.
 .IR suite ;
 otherwise it parses debian/changelog and uses the suite specified
 there.

+suite may be a combined suite, as for clone.

 .TP
 \fBdgit pull\fR [\fIsuite\fP]
 Does dgit fetch, and then merges the new head of the remote tracking
 .TP
 \fBdgit pull\fR [\fIsuite\fP]
 Does dgit fetch, and then merges the new head of the remote tracking


@@ -181,15 +187,14 @@ current directory; however, signing operations are done on the
 invoking host.  This allows you to do a push when the system which has
 the source code and the build outputs has no access to the key:
 
 invoking host.  This allows you to do a push when the system which has
 the source code and the build outputs has no access to the key:
 

+.TS
+l l.

 1.     Clone on build host (dgit clone)
 1.     Clone on build host (dgit clone)

-.br

 2.     Edit code on build host (edit, git commit)
 2.     Edit code on build host (edit, git commit)

-.br

 3.     Build package on build host (dgit build)
 3.     Build package on build host (dgit build)

-.br

 4.     Test package on build host or elsewhere (dpkg -i, test)
 4.     Test package on build host or elsewhere (dpkg -i, test)

-.br

 5.     Upload by invoking dgit rpush on host with your GPG key.
 5.     Upload by invoking dgit rpush on host with your GPG key.

+.TE

 
 However, the build-host must be able to ssh to the dgit repos.  If
 this is not already the case, you must organise it separately, for
 
 However, the build-host must be able to ssh to the dgit repos.  If
 this is not already the case, you must organise it separately, for


@@ -710,6 +715,8 @@ Specifies a single additional option to pass to
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR gbp-pq ,
 .BR gbp-build ,
 or
 .BR gbp-pq ,
 .BR gbp-build ,
 or


@@ -755,6 +762,8 @@ Specifies alternative programs to use instead of
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,
 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,


@@ -879,6 +888,9 @@ Settings likely to be useful for an end user include:
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.

+
+.I suite
+may be a glob pattern.

 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.