X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-sponsorship.7.pod;h=2e6f82d95071c74cc55033b03a73f56a15111aae;hp=08083290c1139e14bd83cc7b41733ee1b4a89816;hb=3193ca2bad512d2563797eca11ceb9d707a65004;hpb=1d01e5ebb230a058093afa0058cde2429545fc54 diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 08083290..2e6f82d9 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -9,7 +9,7 @@ and a sponsoring DD (or DM) can collaborate and publish using git. -The sponsor must to be intending to use dgit for the upload. +The sponsor must be intending to use dgit for the upload. (If the sponsor does not use dgit, it is not possible to properly publish a sponsee's git branch.) @@ -30,7 +30,7 @@ This section is addressed to the sponsee: =head2 General You should prepare the package as if you were going -to upload it with C yourself. +to upload it with C or C yourself. For a straightforward NMU, consult L. @@ -102,7 +102,7 @@ against the sponsorship-requests pseudo-package. The sponsee should push their HEAD as a git branch to any suitable git server. They can use their own git server; -alioth is another possibility. +salsa is another possibility. The branch names used by the sponsee on their local machine, and on the server, do not matter. @@ -220,7 +220,7 @@ C will get you an up-to-date C showing what's in the archive already. -C +C will check that dgit can build an appropriate source package. There is no need to run debdiff. @@ -234,6 +234,8 @@ When you have completed your source review, and use C or similar, to to the build, and then +C +or C to do the upload. @@ -313,7 +315,7 @@ to dgit push for every successive upload. This disables a safety catch which would normally spot situations where changes are accidentally lost. When your sponsee is sending you source packages - -perhaps multiple source pacakges with the same version number - +perhaps multiple source packages with the same version number - these safety catches are inevitably ineffective. =head1 SEE ALSO