1 # SOME DESCRIPTIVE TITLE
2 # Copyright (C) YEAR Free Software Foundation, Inc.
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "POT-Creation-Date: 2018-10-04 01:04+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
20 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
21 #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
22 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
23 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
24 #: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
30 #: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
31 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
32 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
33 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
34 #: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
35 #: ../git-debrebase.5.pod:678
41 #: ../dgit-nmu-simple.7.pod:5 ../dgit-sponsorship.7.pod:5
42 msgid "INTRODUCTION AND SCOPE"
46 #: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173
49 " % dgit --gbp push\n"
54 #: ../dgit-sponsorship.7.pod:3
55 msgid "dgit-sponsorship - tutorial for Debian upload sponsorship, using git"
59 #: ../dgit-sponsorship.7.pod:7
61 "This tutorial describes how a Debian sponsored contributor and a sponsoring "
62 "DD (or DM) can collaborate and publish using git."
66 #: ../dgit-sponsorship.7.pod:12
68 "The sponsor must to be intending to use dgit for the upload. (If the "
69 "sponsor does not use dgit, it is not possible to properly publish a "
70 "sponsee's git branch.)"
74 #: ../dgit-sponsorship.7.pod:17
76 "It is best if the sponsee also uses dgit; but also covered (later on) is the "
77 "case where the sponsee provides a proposed upload in source package form, "
78 "but the sponsor would like to work in git."
82 #: ../dgit-sponsorship.7.pod:22
84 "This tutorial does not provide a checklist for the sponsor's review. Both "
85 "contributors are expected to be familiar with Debian packaging and Debian's "
86 "processes, and with git."
90 #: ../dgit-sponsorship.7.pod:26
91 msgid "SPONSEE WORKFLOW"
95 #: ../dgit-sponsorship.7.pod:28
96 msgid "This section is addressed to the sponsee:"
100 #: ../dgit-sponsorship.7.pod:30
105 #: ../dgit-sponsorship.7.pod:32
107 "You should prepare the package as if you were going to upload it with C<dgit "
108 "push-source> or C<dgit push> yourself."
112 #: ../dgit-sponsorship.7.pod:35
113 msgid "For a straightforward NMU, consult L<dgit-nmu-simple(7)>."
117 #: ../dgit-sponsorship.7.pod:37
119 "If you are the (prospective) maintainer, you can adopt any suitable (dgit-"
120 "compatible) git workflow. The L<dgit-maint-*(7)> tutorials describe some "
121 "of the possibilities."
125 #: ../dgit-sponsorship.7.pod:42
126 msgid "Upload preparation"
130 #: ../dgit-sponsorship.7.pod:44
132 "You should go through all of the steps a self-uploading maintainer would do, "
133 "including building for ad hoc tests, and checking via a formal build (eg "
134 "using C<dgit sbuild>) that the package builds on sid (or the target "
139 #: ../dgit-sponsorship.7.pod:50
141 "At the point where you would, if you were a DD, do the actual upload by "
142 "running dgit push, you hand off to your sponsor."
146 #: ../dgit-sponsorship.7.pod:56
148 "If you were going to use one of the C<--quilt=> options to dgit, or C<dgit --"
149 "gbp> or C<dgit --dpm>, you must specify that in your handoff email - see "
154 #: ../dgit-sponsorship.7.pod:62
155 msgid "git+origs based handoff"
159 #: ../dgit-sponsorship.7.pod:64
160 msgid "The elements of the handoff consists of:"
164 #: ../dgit-sponsorship.7.pod:68 ../dgit-sponsorship.7.pod:72
165 #: ../dgit-sponsorship.7.pod:79 ../dgit-sponsorship.7.pod:84
170 #: ../dgit-sponsorship.7.pod:70
171 msgid "The git branch."
175 #: ../dgit-sponsorship.7.pod:74
177 "Any .orig tarballs which will be needed, or sample git-archive(1) or gbp-"
178 "buildpackage(1) command(s) to generate them."
182 #: ../dgit-sponsorship.7.pod:81
184 "A sample dgit push command, containing any dgit --quilt=, --gbp or --dpm "
189 #: ../dgit-sponsorship.7.pod:86
191 "Plus of course all the usual information about the state of the package, any "
192 "caveats or areas you would like the sponsor to focus their review, "
193 "constraints about upload timing, etc."
197 #: ../dgit-sponsorship.7.pod:93
199 "If the handoff is done by email, the elements above should be a in a single, "
200 "signed, message. This could be an RFS submission against the sponsorship-"
201 "requests pseudo-package."
205 #: ../dgit-sponsorship.7.pod:98
210 #: ../dgit-sponsorship.7.pod:102
212 "The sponsee should push their HEAD as a git branch to any suitable git "
213 "server. They can use their own git server; salsa is another possibility."
217 #: ../dgit-sponsorship.7.pod:107
219 "The branch names used by the sponsee on their local machine, and on the "
220 "server, do not matter."
224 #: ../dgit-sponsorship.7.pod:110
226 "Instead, the sponsee should include the git commit id of their HEAD in their "
231 #: ../dgit-sponsorship.7.pod:116
232 msgid "orig tarballs"
236 #: ../dgit-sponsorship.7.pod:120
238 "If there are any .origs that are not in the archive already, the sponsor "
239 "will need them as part of the upload."
243 #: ../dgit-sponsorship.7.pod:123
245 "If the sponsee generated these tarballs with git-archive(1) or gbp-"
246 "buildpackage(1), they can simply include a sample invocation of git-"
247 "archive(1) or ensure that a suitable gbp.conf is present in the source "
248 "package to generate the tarball."
252 #: ../dgit-sponsorship.7.pod:130
254 "Otherwise, the simplest approach is to commit the orig tarballs with "
255 "pristine-tar(1), e.g."
259 #: ../dgit-sponsorship.7.pod:136
262 " % pristine-tar commit ../foo_1.2.3.orig.tar.xz upstream/1.2.3\n"
267 #: ../dgit-sponsorship.7.pod:140
269 "and be sure to push the pristine-tar branch. If you are using git-"
270 "buildpackage(1), just pass I<--git-pristine-tar> and I<--git-pristine-tar-"
275 #: ../dgit-sponsorship.7.pod:144
277 "Alternatively, the sponsee can put them on a suitable webserver, or attach "
278 "to the e-mail, if they are small."
282 #: ../dgit-sponsorship.7.pod:149
284 "The sponsee should quote sha256sums of the .origs in their handoff email, "
285 "unless they supplied commands to generate them."
289 #: ../dgit-sponsorship.7.pod:155
290 msgid "quilt options"
294 #: ../dgit-sponsorship.7.pod:159
296 "Some workflows involve git branches which are not natively dgit-compatible. "
297 "Normally dgit will convert them as needed, during push."
301 #: ../dgit-sponsorship.7.pod:163
303 "Supply a sample \"dgit push\" command including any C<--gbp> (aka C<--"
304 "quilt=gbp>), C<--dpm> (aka C<--quilt=dpm>), or other C<--quilt=> option they "
309 #: ../dgit-sponsorship.7.pod:179
310 msgid "SPONSOR WORKFLOW"
314 #: ../dgit-sponsorship.7.pod:181 ../dgit-sponsorship.7.pod:273
315 msgid "This part is addressed to the sponsor:"
319 #: ../dgit-sponsorship.7.pod:183
320 msgid "Receiving and validating the sponsorship request"
324 #: ../dgit-sponsorship.7.pod:185
325 msgid "You should check the signature on the email."
329 #: ../dgit-sponsorship.7.pod:187
331 "Use C<git fetch> or C<git clone> to obtain the git branch prepared by your "
332 "sponsee, and obtain any .origs mentioned by the sponsee (to extract .origs "
333 "committed with pristine-tar, you can use origtargz(1), or use \"gbp clone --"
338 #: ../dgit-sponsorship.7.pod:194
340 "Check the git commit ID of the sponsee's branch tip, and the sha256sums of "
341 "the .origs, against the handoff email."
345 #: ../dgit-sponsorship.7.pod:198
346 msgid "Now you can check out the branch tip, and do your substantive review."
350 #: ../dgit-sponsorship.7.pod:201
351 msgid "Dealing with branches that want --quilt="
355 #: ../dgit-sponsorship.7.pod:203
357 "If your sponsee mentioned a C<--quilt> option, and you don't want to grapple "
358 "with their preferred tree format, you can convert their tree into the "
359 "standard dgit view:"
363 #: ../dgit-sponsorship.7.pod:209
366 " % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup\n"
367 " % git checkout unquilted\n"
372 #: ../dgit-sponsorship.7.pod:214
374 "You should check that what you're looking at is a descendant of the "
379 #: ../dgit-sponsorship.7.pod:217
380 msgid "Some hints which may help the review"
384 #: ../dgit-sponsorship.7.pod:219
386 "C<dgit fetch sid> will get you an up-to-date C<refs/remotes/dgit/dgit/sid> "
387 "showing what's in the archive already."
391 #: ../dgit-sponsorship.7.pod:223
393 "C<dgit -wgf --damp-run push-source> will check that dgit can build an "
394 "appropriate source package."
398 #: ../dgit-sponsorship.7.pod:226
400 "There is no need to run debdiff. dgit will not upload anything that doesn't "
401 "unpack to exactly the git commit you are pushing, so you can rely on what "
402 "you see in C<git diff>."
406 #: ../dgit-sponsorship.7.pod:231
407 msgid "Doing the upload"
411 #: ../dgit-sponsorship.7.pod:233
413 "When you have completed your source review, and use C<dgit -wgf [--"
414 "quilt=...] sbuild -A -C> or similar, to to the build, and then C<dgit -wgf "
415 "[--quilt=...] push-source> or C<dgit -wgf [--quilt=...] push> to do the "
420 #: ../dgit-sponsorship.7.pod:242
422 "Check whether the sponsee made a debian/I<version> tag. If they did, ensure "
423 "you have their tag in the repository you are pushing from, or pass C<--no-"
424 "dep14tag>. This avoids identically named, non-identical tags, which can be "
429 #: ../dgit-sponsorship.7.pod:249
431 "(It is possible to upload from the quilt-cache dgit view. If you want to do "
432 "this, B<do not> pass the C<--quilt> or C<--gbp> or C<--dpm> options again, "
433 "and B<do> pass C<--no-dep14tag>, since the debian/I<version> tag should go "
434 "on the sponsee's branch.)"
438 #: ../dgit-sponsorship.7.pod:257
440 "If this was the first upload done with dgit, you may need to pass C<--"
441 "overwrite> to dgit."
445 #: ../dgit-sponsorship.7.pod:262
447 "Alternatively, if this was the first ever dgit push of the package, you can "
448 "pass C<--deliberately-not-fast-forward> instead of C<--overwrite>. This "
449 "avoids introducing a new origin commit into the dgit view of the sponsee's "
450 "git history which is unnecessary and could be confusing."
454 #: ../dgit-sponsorship.7.pod:271
455 msgid "SPONSORING A NON-GIT-USING SPONSEE"
459 #: ../dgit-sponsorship.7.pod:275
461 "If your sponsee does not use git, you can still do your review with git, and "
462 "use dgit for the upload."
466 #: ../dgit-sponsorship.7.pod:279
468 "Your sponsee will provide you with a source package: that is, a .dsc and the "
469 "files it refers to. Obtain these files, and check signatures as "
474 #: ../dgit-sponsorship.7.pod:286
477 " % dgit clone PACKAGE\n"
479 " % dgit import-dsc /path/to/sponsee's.dsc +sponsee\n"
480 " % git checkout sponsee\n"
485 #: ../dgit-sponsorship.7.pod:293
486 msgid "Or for an entirely new package:"
490 #: ../dgit-sponsorship.7.pod:297
496 " % dgit -pPACKAGE import-dsc /path/to/sponsee's.dsc +sponsee\n"
501 #: ../dgit-sponsorship.7.pod:304
503 "This will leave you looking at the sponsee's package, formatted as a dgit "
508 #: ../dgit-sponsorship.7.pod:307
510 "When you have finished your review and your tests, you can do the dgit "
511 "sbuild and dgit push directly from the \"sponsee\" branch."
515 #: ../dgit-sponsorship.7.pod:312
517 "You will need to pass C<--overwrite> to dgit push for every successive "
518 "upload. This disables a safety catch which would normally spot situations "
519 "where changes are accidentally lost. When your sponsee is sending you "
520 "source packages - perhaps multiple source pacakges with the same version "
521 "number - these safety catches are inevitably ineffective."
525 #: ../dgit-sponsorship.7.pod:323
526 msgid "dgit(1), dgit(7), dgit-nmu-simple(7), dgit-maint-*(7)"