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-user.7.pod:5 ../dgit-maint-native.7.pod:5
42 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
43 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
44 #: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
49 #: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56
54 #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128
55 #: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138
56 msgid "dgit(1), dgit(7)"
60 #: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16
61 #: ../dgit-maint-debrebase.7.pod:38
63 "Benefit from dgit's safety catches. In particular, ensure that your upload "
64 "always matches exactly your git HEAD."
68 #: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130
69 #: ../dgit-maint-debrebase.7.pod:526
70 msgid "INCORPORATING NMUS"
74 #: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140
75 #: ../dgit-maint-debrebase.7.pod:726
80 #: ../dgit-maint-gbp.7.pod:3
82 "dgit - tutorial for package maintainers already using git-buildpackage(1)"
86 #: ../dgit-maint-gbp.7.pod:7
88 "This document explains how B<dgit> can be incorporated into a git-"
89 "buildpackage(1) package-maintenance workflow. This should be read jointly "
90 "with git-buildpackage(1)'s documentation. Some reasons why you might want "
91 "to incorporate B<dgit> into your existing workflow:"
95 #: ../dgit-maint-gbp.7.pod:21
97 "Provide a better, more detailed git history to downstream dgit users, such "
98 "as people using dgit to do an NMU (see dgit-nmu-simple(7) and dgit-user(7))."
102 #: ../dgit-maint-gbp.7.pod:27
104 "Note that we assume a patches-unapplied repository: the upstream source "
105 "committed to the git repository is unpatched. git-buildpackage(1) can work "
106 "with patched-applied repositories, but is normally used with patches-"
111 #: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293
112 msgid "GIT CONFIGURATION"
116 #: ../dgit-maint-gbp.7.pod:34
118 "If you have configured an I<export-dir> in your gbp.conf, you should tell "
123 #: ../dgit-maint-gbp.7.pod:39
126 " % git config --global dgit.default.build-products-dir /home/spwhitton/build-area\n"
131 #: ../dgit-maint-gbp.7.pod:43
136 #: ../dgit-maint-gbp.7.pod:47
139 " % git config dgit.default.quilt-mode gbp\n"
144 #: ../dgit-maint-gbp.7.pod:51
145 msgid "in your repository, you can omit I<--gbp> wherever it occurs below."
149 #: ../dgit-maint-gbp.7.pod:53
151 "Note that this does require that you always work from your gbp master "
152 "branch, never the dgit patches-applied branch."
156 #: ../dgit-maint-gbp.7.pod:58
157 msgid "You can perform test builds like this:"
161 #: ../dgit-maint-gbp.7.pod:62
164 " % dgit [--include-dirty] gbp-build [OPTIONS]\n"
169 #: ../dgit-maint-gbp.7.pod:66
171 "where I<--include-dirty> is needed for testing uncommitted changes, and "
172 "I<OPTIONS> are any further options to be passed on to gbp-buildpackage(1)."
176 #: ../dgit-maint-gbp.7.pod:70
178 "If you are doing a source-only upload, you do not need to prepare a "
179 "I<_source.changes>, as B<dgit push-source> will take of that on your behalf."
183 #: ../dgit-maint-gbp.7.pod:74
185 "If you need to include binaries with your upload, you will probably want to "
186 "use sbuild(1), pbuilder(1) or cowbuilder(1):"
190 #: ../dgit-maint-gbp.7.pod:79
193 " % dgit --rm-old-changes --gbp sbuild\n"
198 #: ../dgit-maint-gbp.7.pod:83
199 msgid "replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate."
203 #: ../dgit-maint-gbp.7.pod:85
205 "We use I<--rm-old-changes> to ensure that there is exactly one changes file "
206 "corresponding to this package, so we can be confident we're uploading what "
207 "we intend (though B<dgit push> will do some safety checks)."
211 #: ../dgit-maint-gbp.7.pod:90
213 "Note that none of the commands in this section are required to upload with "
214 "dgit. You can invoke gbp-buildpackage(1), pbuilder(1), cowbuilder(1) and "
215 "sbuild(1) directly. However, the defaults for these tools may leave you "
216 "with something that dgit will refuse to upload because it doesn't match your "
221 #: ../dgit-maint-gbp.7.pod:96
222 msgid "As a general rule, leave all signing and tagging to dgit."
226 #: ../dgit-maint-gbp.7.pod:98
231 #: ../dgit-maint-gbp.7.pod:100
233 "Don't use I<--git-tag>: B<dgit push> will do this for you. To do a source-"
238 #: ../dgit-maint-gbp.7.pod:105
241 " % dgit --gbp push-source\n"
246 #: ../dgit-maint-gbp.7.pod:109
247 msgid "or if you need to include binaries,"
251 #: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173
254 " % dgit --gbp push\n"
259 #: ../dgit-maint-gbp.7.pod:117
261 "This will push your git history to the dgit-repos, but you probably want to "
262 "follow it up with a push to salsa."
266 #: ../dgit-maint-gbp.7.pod:120
268 "You will need to pass I<--overwrite> if the previous upload was not "
269 "performed with dgit."
273 #: ../dgit-maint-gbp.7.pod:123
275 "If this is first ever dgit push of the package, consider passing I<--"
276 "deliberately-not-fast-forward> instead of I<--overwrite>. This avoids "
277 "introducing a new origin commit into the dgit view of your git history. "
278 "(This origin commit would represent the most recent non-dgit upload of the "
279 "package, but this should already be represented in your git history.)"
283 #: ../dgit-maint-gbp.7.pod:132
285 "B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp "
286 "branches. You can just apply the NMU diff the traditional way. The next "
287 "upload will require I<--overwrite>."
291 #: ../dgit-maint-gbp.7.pod:142
293 "This tutorial was written and is maintained by Sean Whitton "
294 "<spwhitton@spwhitton.name>."