diff options
Diffstat (limited to 'po4a')
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 387 | ||||
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 258 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 659 | ||||
| -rw-r--r-- | po4a/dgit_7.pot | 102 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 22 | ||||
| -rw-r--r-- | po4a/git-debrebase_5.pot | 30 |
6 files changed, 844 insertions, 614 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 71969f4..3c25348 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,7 +43,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -66,9 +68,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:326 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361 +#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:352 msgid "When upstream tags releases in git" msgstr "" @@ -106,8 +108,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 #, no-wrap msgid "" " % git deborig\n" @@ -127,14 +129,51 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 -#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:334 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137 +msgid "Using untagged upstream commits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141 +msgid "" +"Sometimes upstream does not tag their releases, or you want to package an " +"unreleased git snapshot. In such a case you can create your own upstream " +"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream " +"version you plan to put in I<debian/changelog>. The B<upstream/> prefix " +"ensures that your tag will not clash with any tags upstream later creates." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148 +msgid "" +"For example, suppose that the latest upstream release is 1.2.2 and you want " +"to package git commit ab34c21 which was made on 2013-12-11. A common " +"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 " +"and so you could use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159 +msgid "to obtain a release tag, and then proceed as above." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373 +#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:364 msgid "When upstream releases only tarballs" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 #, no-wrap msgid "" " % mkdir foo\n" @@ -144,12 +183,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 #, no-wrap msgid "" " [DEFAULT]\n" @@ -160,7 +199,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 #, no-wrap msgid "" " sign-tags = True\n" @@ -170,7 +209,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 #, no-wrap msgid "" " [import-orig]\n" @@ -179,12 +218,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -196,12 +235,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 #, no-wrap msgid "" " % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -209,7 +248,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 msgid "" "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -217,7 +256,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -226,19 +265,19 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -246,24 +285,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294 +#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441 +#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324 +#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330 +#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" " % git remote update\n" @@ -271,7 +310,15 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +msgid "" +"If you want to package an untagged upstream commit (because upstream does " +"not tag releases or because you want to package an upstream development " +"snapshot), see \"Using untagged upstream commits\" above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -280,12 +327,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341 +#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345 +#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -293,12 +340,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349 +#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:353 +#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -306,7 +353,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -314,12 +361,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472 +#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546 +#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -328,19 +375,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:551 +#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:582 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:751 +#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 +#: ../git-debpush.1.pod:228 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753 +#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -348,7 +396,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324 msgid "GIT CONFIGURATION" msgstr "" @@ -481,14 +529,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:165 msgid "" "Because we want to work in git, we need a virtual upstream branch with " "virtual release tags. gbp-import-orig(1) can manage this for us. To begin" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:200 +#: ../dgit-maint-debrebase.7.pod:226 msgid "" "You are now ready to proceed as above, making commits to the I<debian/> " "directory and to the upstream source. As above, for technical reasons, B<it " @@ -498,7 +546,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:212 +#: ../dgit-maint-debrebase.7.pod:238 msgid "" "If you have an existing git history that you have pushed to an ordinary git " "server like B<salsa.debian.org>, we start with that. If you don't already " @@ -507,7 +555,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:219 +#: ../dgit-maint-debrebase.7.pod:245 #, no-wrap msgid "" " % git clone salsa.debian.org:Debian/foo\n" @@ -518,14 +566,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:226 +#: ../dgit-maint-debrebase.7.pod:252 msgid "" "If you don't have any existing git history, or you have history only on the " "special B<dgit-repos> server, we start with B<dgit clone>:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:231 +#: ../dgit-maint-debrebase.7.pod:257 #, no-wrap msgid "" " % dgit clone foo\n" @@ -534,12 +582,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:236 +#: ../dgit-maint-debrebase.7.pod:262 msgid "Then we make new upstream tags available:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:244 +#: ../dgit-maint-debrebase.7.pod:270 msgid "" "We now use a B<git debrebase convert-from-*> command to convert your " "existing history to the git-debrebase(5) data model. Which command you " @@ -547,17 +595,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:250 +#: ../dgit-maint-debrebase.7.pod:276 msgid "(A) There is no delta queue." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:252 +#: ../dgit-maint-debrebase.7.pod:278 msgid "If there do not exist any Debian patches, use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294 #, no-wrap msgid "" " % git debrebase convert-from-gbp\n" @@ -565,12 +613,12 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:260 +#: ../dgit-maint-debrebase.7.pod:286 msgid "(B) There is a delta queue, and patches are unapplied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:262 +#: ../dgit-maint-debrebase.7.pod:288 msgid "" "This is the standard git-buildpackage(1) workflow: there are Debian patches, " "but the upstream source is committed to git without those patches applied. " @@ -578,7 +626,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:272 +#: ../dgit-maint-debrebase.7.pod:298 msgid "" "If you were not previously using dgit to upload your package (i.e. you were " "not using the workflow described in dgit-maint-gbp(7)), and you happen to " @@ -587,17 +635,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:277 +#: ../dgit-maint-debrebase.7.pod:303 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:279 +#: ../dgit-maint-debrebase.7.pod:305 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:283 +#: ../dgit-maint-debrebase.7.pod:309 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -605,7 +653,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-debrebase.7.pod:315 msgid "" "Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it " "is exactly what you would get if you deleted .git, invoked B<dpkg-" @@ -613,7 +661,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:300 +#: ../dgit-maint-debrebase.7.pod:326 msgid "" "git-debrebase(1) does not yet support using B<git merge> to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -621,7 +669,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:307 +#: ../dgit-maint-debrebase.7.pod:333 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -629,14 +677,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:311 +#: ../dgit-maint-debrebase.7.pod:337 msgid "" "Now when you pull work from other Debian contributors, git will rebase your " "work on top of theirs." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:314 +#: ../dgit-maint-debrebase.7.pod:340 msgid "" "If you use this clone for upstream development in addition to Debian " "packaging work, you may not want to set this global setting. Instead, see " @@ -645,24 +693,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-debrebase.7.pod:345 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-debrebase.7.pod:347 msgid "" "There are two steps: obtaining git refs that correspond to the new release, " "and importing that release using git-debrebase(1)." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:357 +#: ../dgit-maint-debrebase.7.pod:387 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:361 +#: ../dgit-maint-debrebase.7.pod:391 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -670,7 +718,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:365 +#: ../dgit-maint-debrebase.7.pod:395 msgid "" "This invocation of git-debrebase(1) involves a git rebase. You may need to " "resolve conflicts if the Debian delta queue does not apply cleanly to the " @@ -678,13 +726,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:369 +#: ../dgit-maint-debrebase.7.pod:399 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:374 +#: ../dgit-maint-debrebase.7.pod:404 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -692,35 +740,36 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:378 +#: ../dgit-maint-debrebase.7.pod:408 msgid "" -"Pass I<--stat> just to see the list of changed files, which is useful to " -"determine whether there are any new or deleted files that may need " -"accounting for in your copyright file." +"Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the " +"list of added or removed files, which is useful to determine whether there " +"are any new or deleted files that may need accounting for in your copyright " +"file." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:392 +#: ../dgit-maint-debrebase.7.pod:423 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:394 +#: ../dgit-maint-debrebase.7.pod:425 msgid "Just make commits on master that change the contents of I<debian/>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:396 +#: ../dgit-maint-debrebase.7.pod:427 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:398 +#: ../dgit-maint-debrebase.7.pod:429 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:400 +#: ../dgit-maint-debrebase.7.pod:431 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I<debian/> directory. You can also use tools like git-" @@ -728,19 +777,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:404 +#: ../dgit-maint-debrebase.7.pod:435 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:406 +#: ../dgit-maint-debrebase.7.pod:437 msgid "" "git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, " "re-order and delete patches. Run" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714 +#: ../dgit-maint-debrebase.7.pod:442 ../dgit-maint-debrebase.7.pod:745 #, no-wrap msgid "" " % git debrebase -i\n" @@ -748,19 +797,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:415 +#: ../dgit-maint-debrebase.7.pod:446 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B<git rebase -i>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:418 +#: ../dgit-maint-debrebase.7.pod:449 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:420 +#: ../dgit-maint-debrebase.7.pod:451 msgid "" "After completing the git rebase, your branch will not be a fast-forward of " "the git HEAD you had before the rebase. This means that we cannot push the " @@ -769,14 +818,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:426 +#: ../dgit-maint-debrebase.7.pod:457 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B<salsa.debian.org>," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:431 +#: ../dgit-maint-debrebase.7.pod:462 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -784,7 +833,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:466 msgid "" "Note that each time you conclude a debrebase you introduce a pseudomerge " "into your git history, which may make it harder to read. Try to do all of " @@ -794,7 +843,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:443 +#: ../dgit-maint-debrebase.7.pod:474 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit " @@ -802,14 +851,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:447 +#: ../dgit-maint-debrebase.7.pod:478 msgid "" "Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> " "if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:450 +#: ../dgit-maint-debrebase.7.pod:481 msgid "" "In some cases where you used B<git debrebase convert-from-gbp> since the " "last upload, it is not possible for dgit to make your history fast-" @@ -819,7 +868,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:456 +#: ../dgit-maint-debrebase.7.pod:487 msgid "" "Right before uploading, if you did not just already do so, you might want to " "have git-debrebase(1) shuffle your branch such that the Debian delta queue " @@ -827,7 +876,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:462 +#: ../dgit-maint-debrebase.7.pod:493 #, no-wrap msgid "" " % git debrebase\n" @@ -836,24 +885,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:467 +#: ../dgit-maint-debrebase.7.pod:498 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:469 +#: ../dgit-maint-debrebase.7.pod:500 msgid "" "After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:474 +#: ../dgit-maint-debrebase.7.pod:505 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-debrebase.7.pod:507 msgid "" "Here we explain how to handle material that is merely DFSG-non-free. " "Material which is legally dangerous (for example, files which are actually " @@ -861,7 +910,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:480 +#: ../dgit-maint-debrebase.7.pod:511 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -873,12 +922,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:486 +#: ../dgit-maint-debrebase.7.pod:517 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:488 +#: ../dgit-maint-debrebase.7.pod:519 msgid "" "Our approach is to maintain a DFSG-clean upstream branch, and create tags on " "this branch for each release that we want to import. We then import those " @@ -887,12 +936,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:494 +#: ../dgit-maint-debrebase.7.pod:525 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:498 +#: ../dgit-maint-debrebase.7.pod:529 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -904,14 +953,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:506 +#: ../dgit-maint-debrebase.7.pod:537 msgid "" "Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or " "in the case of a new package," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:511 +#: ../dgit-maint-debrebase.7.pod:542 #, no-wrap msgid "" " % git branch --unset-upstream\n" @@ -920,18 +969,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:516 +#: ../dgit-maint-debrebase.7.pod:547 msgid "and proceed with \"INITIAL DEBIANISATION\"." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:518 +#: ../dgit-maint-debrebase.7.pod:549 msgid "" "For subsequent releases (whether or not they require additional filtering):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:523 +#: ../dgit-maint-debrebase.7.pod:554 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -945,7 +994,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:533 +#: ../dgit-maint-debrebase.7.pod:564 msgid "" "Our upstream-dfsg branch cannot be pushed to B<dgit-repos>, but since we " "will need it whenever we import a new upstream version, we must push it " @@ -954,7 +1003,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:540 +#: ../dgit-maint-debrebase.7.pod:571 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -962,17 +1011,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:544 +#: ../dgit-maint-debrebase.7.pod:575 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:584 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:557 +#: ../dgit-maint-debrebase.7.pod:588 #, no-wrap msgid "" " % dgit fetch\n" @@ -981,7 +1030,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:562 +#: ../dgit-maint-debrebase.7.pod:593 msgid "" "If that fails, because your branch and the NMUers' work represent divergent " "branches of development, you have a number of options. Here we describe the " @@ -989,7 +1038,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:566 +#: ../dgit-maint-debrebase.7.pod:597 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I<debian/patches>. Changes there would either cause trouble, or be " @@ -997,12 +1046,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:570 +#: ../dgit-maint-debrebase.7.pod:601 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:574 +#: ../dgit-maint-debrebase.7.pod:605 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -1010,14 +1059,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:578 +#: ../dgit-maint-debrebase.7.pod:609 msgid "" "If the NMUer added new commits modifying the upstream source, you will " "probably want to debrebase before your next upload to tidy those up." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-debrebase.7.pod:612 msgid "" "For example, the NMUer might have used git-revert(1) to unapply one of your " "patches. A debrebase can be used to strip both the patch and the reversion " @@ -1025,12 +1074,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:585 +#: ../dgit-maint-debrebase.7.pod:616 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:587 +#: ../dgit-maint-debrebase.7.pod:618 msgid "" "If you cannot rebase because you have already pushed to B<salsa.debian.org>, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " @@ -1038,24 +1087,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:592 +#: ../dgit-maint-debrebase.7.pod:623 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:594 +#: ../dgit-maint-debrebase.7.pod:625 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:596 +#: ../dgit-maint-debrebase.7.pod:627 msgid "" "Above we noted that each time you conclude a debrebase, you introduce a " "pseudomerge into your git history, which may make it harder to read." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:599 +#: ../dgit-maint-debrebase.7.pod:630 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B<git debrebase conclude> only right before you upload or push to B<salsa." @@ -1063,7 +1112,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:603 +#: ../dgit-maint-debrebase.7.pod:634 msgid "" "It is possible, though much less convenient, to reduce the number of " "pseudomerges yet further. We debrebase only (i) when importing a new " @@ -1075,12 +1124,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:611 +#: ../dgit-maint-debrebase.7.pod:642 msgid "The debian/patches directory" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:613 +#: ../dgit-maint-debrebase.7.pod:644 msgid "" "In this workflow, I<debian/patches> is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1088,7 +1137,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:618 +#: ../dgit-maint-debrebase.7.pod:649 msgid "" "I<debian/patches> will often be out-of-date because git-debrebase(1) will " "only regenerate it when it needs to. So you should not rely on the " @@ -1098,17 +1147,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:624 +#: ../dgit-maint-debrebase.7.pod:655 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:626 +#: ../dgit-maint-debrebase.7.pod:657 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:628 +#: ../dgit-maint-debrebase.7.pod:659 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1117,7 +1166,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:634 +#: ../dgit-maint-debrebase.7.pod:665 msgid "" "The idea here is that from Debian's point of view, upstream releases are " "immutable points in history. We want to make sure that we are basing our " @@ -1126,19 +1175,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:640 +#: ../dgit-maint-debrebase.7.pod:671 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I<remotes/upstream/master>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:643 +#: ../dgit-maint-debrebase.7.pod:674 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:645 +#: ../dgit-maint-debrebase.7.pod:676 msgid "" "If this is the first ever dgit push of the package, consider passing I<--" "deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " @@ -1148,12 +1197,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:651 +#: ../dgit-maint-debrebase.7.pod:682 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:653 +#: ../dgit-maint-debrebase.7.pod:684 msgid "" "The git history made by git-debrebase can seem complicated. Here are some " "suggestions for helpful invocations of gitk and git. They can be adapted " @@ -1161,12 +1210,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:657 +#: ../dgit-maint-debrebase.7.pod:688 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:661 +#: ../dgit-maint-debrebase.7.pod:692 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1174,17 +1223,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:694 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:667 +#: ../dgit-maint-debrebase.7.pod:698 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:700 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1192,12 +1241,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:671 +#: ../dgit-maint-debrebase.7.pod:702 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:673 +#: ../dgit-maint-debrebase.7.pod:704 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1205,12 +1254,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:706 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:679 +#: ../dgit-maint-debrebase.7.pod:710 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1218,7 +1267,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:681 +#: ../dgit-maint-debrebase.7.pod:712 msgid "" "The \"Declare fast forward\" commits you see have an older history (usually, " "an older delta queue) as one parent, and a newer history as the other. --" @@ -1226,12 +1275,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:688 +#: ../dgit-maint-debrebase.7.pod:719 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:692 +#: ../dgit-maint-debrebase.7.pod:723 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1239,17 +1288,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:694 +#: ../dgit-maint-debrebase.7.pod:725 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:698 +#: ../dgit-maint-debrebase.7.pod:729 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:700 +#: ../dgit-maint-debrebase.7.pod:731 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1258,12 +1307,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:703 +#: ../dgit-maint-debrebase.7.pod:734 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:705 +#: ../dgit-maint-debrebase.7.pod:736 #, no-wrap msgid "" " % git debrebase status\n" @@ -1271,24 +1320,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:707 +#: ../dgit-maint-debrebase.7.pod:738 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:709 +#: ../dgit-maint-debrebase.7.pod:740 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:718 +#: ../dgit-maint-debrebase.7.pod:749 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:722 +#: ../dgit-maint-debrebase.7.pod:753 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1296,7 +1345,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:727 +#: ../dgit-maint-debrebase.7.pod:758 msgid "" "A third alternative is to have git-debrebase(1) shuffle all the Debian " "changes to the end of your branch, and then manipulate them yourself using " @@ -1304,7 +1353,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:733 +#: ../dgit-maint-debrebase.7.pod:764 #, no-wrap msgid "" " % git debrebase\n" @@ -1313,7 +1362,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:738 +#: ../dgit-maint-debrebase.7.pod:769 msgid "" "If you take this approach, you should be very careful not to start the " "rebase too early, including before the most recent pseudomerge. git-rebase " @@ -1323,6 +1372,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:749 +#: ../dgit-maint-debrebase.7.pod:780 msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" msgstr "" diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index 1dbb682..129dca5 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,36 +21,38 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -59,18 +61,18 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" #. type: textblock #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138 msgid "dgit(1), dgit(7)" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:514 #, no-wrap msgid "" " % dgit pull\n" @@ -147,9 +149,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361 +#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:352 msgid "When upstream tags releases in git" msgstr "" @@ -216,8 +218,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 #, no-wrap msgid "" " % git deborig\n" @@ -261,21 +263,58 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 -#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:329 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137 +msgid "Using untagged upstream commits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141 +msgid "" +"Sometimes upstream does not tag their releases, or you want to package an " +"unreleased git snapshot. In such a case you can create your own upstream " +"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream " +"version you plan to put in I<debian/changelog>. The B<upstream/> prefix " +"ensures that your tag will not clash with any tags upstream later creates." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148 +msgid "" +"For example, suppose that the latest upstream release is 1.2.2 and you want " +"to package git commit ab34c21 which was made on 2013-12-11. A common " +"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 " +"and so you could use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159 +msgid "to obtain a release tag, and then proceed as above." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373 +#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:364 msgid "When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:125 +#: ../dgit-maint-merge.7.pod:151 msgid "" "We need a virtual upstream branch with virtual release tags. gbp-import-" "orig(1) can manage this for us. To begin" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 #, no-wrap msgid "" " % mkdir foo\n" @@ -285,12 +324,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 #, no-wrap msgid "" " [DEFAULT]\n" @@ -301,7 +340,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 #, no-wrap msgid "" " sign-tags = True\n" @@ -311,7 +350,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 #, no-wrap msgid "" " [import-orig]\n" @@ -320,12 +359,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -337,12 +376,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 #, no-wrap msgid "" " % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -350,7 +389,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 msgid "" "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -358,7 +397,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -367,31 +406,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:185 +#: ../dgit-maint-merge.7.pod:211 msgid "" "You are now ready to proceed as above, making commits to both the upstream " "source and the I<debian/> directory." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:219 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:223 #, no-wrap msgid "" " % dgit clone foo\n" @@ -401,19 +440,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:203 +#: ../dgit-maint-merge.7.pod:229 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:205 +#: ../dgit-maint-merge.7.pod:231 msgid "" "First, if you don't already have the git history locally, clone it, and " "obtain the corresponding orig.tar from the archive:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:210 +#: ../dgit-maint-merge.7.pod:236 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -423,12 +462,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 +#: ../dgit-maint-merge.7.pod:242 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:220 +#: ../dgit-maint-merge.7.pod:246 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -437,12 +476,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:225 +#: ../dgit-maint-merge.7.pod:251 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -450,12 +489,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:233 +#: ../dgit-maint-merge.7.pod:259 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:235 +#: ../dgit-maint-merge.7.pod:261 msgid "" "Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., " "it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\." @@ -463,19 +502,19 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:240 +#: ../dgit-maint-merge.7.pod:266 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:246 +#: ../dgit-maint-merge.7.pod:272 msgid "" "The first dgit push will require I<--overwrite>. If this is the first ever " "dgit push of the package, consider passing I<--deliberately-not-fast-" @@ -486,24 +525,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:253 +#: ../dgit-maint-merge.7.pod:279 msgid "SOURCE PACKAGE CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:255 +#: ../dgit-maint-merge.7.pod:281 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:257 +#: ../dgit-maint-merge.7.pod:283 msgid "" "We set some source package options such that dgit can transparently handle " "the \"dropping\" and \"refreshing\" of changes to the upstream source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:263 +#: ../dgit-maint-merge.7.pod:289 #, no-wrap msgid "" " single-debian-patch\n" @@ -512,26 +551,26 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 +#: ../dgit-maint-merge.7.pod:294 msgid "" "You don't need to create this file if you are using the version 1.0 source " "package format." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:271 +#: ../dgit-maint-merge.7.pod:297 msgid "Sample text for debian/source/patch-header" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:273 +#: ../dgit-maint-merge.7.pod:299 msgid "" "It is a good idea to explain how a user can obtain a breakdown of the " "changes to the upstream source:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:278 +#: ../dgit-maint-merge.7.pod:304 msgid "" "The Debian packaging of foo is maintained in git, using the merging workflow " "described in dgit-maint-merge(7). There isn't a patch queue that can be " @@ -539,7 +578,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:282 +#: ../dgit-maint-merge.7.pod:308 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -548,7 +587,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:290 +#: ../dgit-maint-merge.7.pod:316 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -558,18 +597,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:296 +#: ../dgit-maint-merge.7.pod:322 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:299 +#: ../dgit-maint-merge.7.pod:325 msgid "A single combined diff, containing all the changes, follows." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:303 +#: ../dgit-maint-merge.7.pod:329 msgid "" "If you are using the version 1.0 source package format, this text should be " "added to README.source instead. The version 1.0 source package format " @@ -577,7 +616,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:307 +#: ../dgit-maint-merge.7.pod:333 msgid "" "If you're using the version 3.0 (quilt) source package format, you could add " "this text to README.source instead of debian/source/patch-header, but this " @@ -585,12 +624,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:314 +#: ../dgit-maint-merge.7.pod:340 msgid "" "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, " "B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any " @@ -600,7 +639,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:320 +#: ../dgit-maint-merge.7.pod:346 msgid "" "As an alternative to B<dgit build> and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " @@ -611,7 +650,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:327 +#: ../dgit-maint-merge.7.pod:353 msgid "" "If you want to skip dgit's checks while iterating on a problem with the " "package build (for example, you don't want to commit your changes to git), " @@ -619,17 +658,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:331 +#: ../dgit-maint-merge.7.pod:357 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" " % git remote update\n" @@ -637,7 +676,15 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +msgid "" +"If you want to package an untagged upstream commit (because upstream does " +"not tag releases or because you want to package an upstream development " +"snapshot), see \"Using untagged upstream commits\" above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -646,12 +693,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -659,12 +706,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -672,12 +719,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:366 +#: ../dgit-maint-merge.7.pod:396 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:368 +#: ../dgit-maint-merge.7.pod:398 msgid "" "It's a good idea to preview the merge of the new upstream release. First, " "just check for any new or deleted files that may need accounting for in your " @@ -685,20 +732,20 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:404 #, no-wrap msgid "" -" % git diff --stat master..1.2.3 -- . ':!debian'\n" +" % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:378 +#: ../dgit-maint-merge.7.pod:408 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:382 +#: ../dgit-maint-merge.7.pod:412 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -706,12 +753,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:386 +#: ../dgit-maint-merge.7.pod:416 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:390 +#: ../dgit-maint-merge.7.pod:420 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -721,7 +768,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -729,17 +776,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:410 +#: ../dgit-maint-merge.7.pod:440 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:414 +#: ../dgit-maint-merge.7.pod:444 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -752,7 +799,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:453 msgid "" "Before merging the new 1.2.3+dfsg tag to master, you should first determine " "whether it would be legally dangerous for the non-free material to be " @@ -760,7 +807,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:428 +#: ../dgit-maint-merge.7.pod:458 msgid "" "If it would be dangerous, there is a big problem; in this case please " "consult your archive administrators (for Debian this is the dgit " @@ -769,7 +816,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -778,40 +825,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:440 +#: ../dgit-maint-merge.7.pod:470 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:442 +#: ../dgit-maint-merge.7.pod:472 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:448 +#: ../dgit-maint-merge.7.pod:478 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 +#: ../dgit-maint-merge.7.pod:482 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:457 +#: ../dgit-maint-merge.7.pod:487 msgid "" "Push the branch somewhere and ask upstream to merge it, or use git-format-" "patch(1) or git-request-pull(1)." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:462 +#: ../dgit-maint-merge.7.pod:492 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:466 +#: ../dgit-maint-merge.7.pod:496 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -825,7 +872,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:476 +#: ../dgit-maint-merge.7.pod:506 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -833,26 +880,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:582 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:488 +#: ../dgit-maint-merge.7.pod:518 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " "will then require I<--overwrite>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 +#: ../git-debpush.1.pod:228 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 6a149f6..2e5c389 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,7 +33,8 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" @@ -43,8 +44,8 @@ msgstr "" msgid "dgit - git integration with the Debian archive" msgstr "" -#. type: SH -#: ../dgit.1:6 +#. type: =head1 +#: ../dgit.1:6 ../git-debpush.1.pod:5 #, no-wrap msgid "SYNOPSIS" msgstr "" @@ -89,8 +90,8 @@ msgstr "" msgid "B<dgit> [I<dgit-opts>] I<action> ..." msgstr "" -#. type: SH -#: ../dgit.1:33 +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -417,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1192 +#: ../dgit.1:185 ../dgit.1:1269 msgid "Print a usage summary." msgstr "" @@ -594,7 +595,7 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 #, no-wrap msgid "1." msgstr "" @@ -606,7 +607,7 @@ msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 #, no-wrap msgid "2." msgstr "" @@ -618,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 #, no-wrap msgid "3." msgstr "" @@ -1228,25 +1229,36 @@ msgid "" "won't make broken pushes.)" msgstr "" +#. type: Plain text +#: ../dgit.1:657 +msgid "" +"Note that this does B<not> prevent dgit from cleaning your tree, so if the " +"changes in your working tree are in the form of untracked files, those might " +"still be deleted, especially with --clean=git. If you want to include " +"untracked files in the build, you can use --clean=none or --clean=dpkg-" +"source[-d] in addition to --include-dirty. Note that this combination can " +"fail if the untracked files are under I<debian/patches/>." +msgstr "" + #. type: TP -#: ../dgit.1:645 +#: ../dgit.1:657 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:648 +#: ../dgit.1:660 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:648 +#: ../dgit.1:660 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:659 +#: ../dgit.1:671 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1255,14 +1267,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:666 +#: ../dgit.1:678 msgid "" "It is safer not to specify I<previous-version>, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:670 +#: ../dgit.1:682 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1270,14 +1282,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:676 +#: ../dgit.1:688 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:690 +#: ../dgit.1:702 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1288,7 +1300,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:696 +#: ../dgit.1:708 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1297,26 +1309,26 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:701 +#: ../dgit.1:713 msgid "" -"(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the " -"dgit view and the maintainer view, the pseudo-merge will appear only in the " -"dgit view.)" +"(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " +"split between the dgit view and the maintainer view, the pseudo-merge will " +"appear only in the dgit view.)" msgstr "" #. type: TP -#: ../dgit.1:701 +#: ../dgit.1:713 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:704 +#: ../dgit.1:716 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:714 +#: ../dgit.1:726 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1326,27 +1338,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:731 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:719 +#: ../dgit.1:731 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:725 +#: ../dgit.1:737 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:735 +#: ../dgit.1:747 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1355,7 +1367,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:743 +#: ../dgit.1:755 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1364,48 +1376,48 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:743 +#: ../dgit.1:755 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:753 +#: ../dgit.1:765 msgid "" -"Specifies that when a split view quilt mode is in operation, and dgit " -"calculates (or looks up in its cache) a dgit view corresponding to your " -"HEAD, the dgit view will be left in I<ref>. The specified ref is " -"unconditionally overwritten, so don't specify a branch you want to keep." +"Specifies that when split view is in operation, and dgit calculates (or " +"looks up in its cache) a dgit view corresponding to your HEAD, the dgit " +"view will be left in I<ref>. The specified ref is unconditionally " +"overwritten, so don't specify a branch you want to keep." msgstr "" #. type: Plain text -#: ../dgit.1:760 +#: ../dgit.1:769 msgid "" "This option is effective only with the following operations: quilt-fixup; " -"push; all builds. And it is only effective with --[quilt=]gbp, --" -"[quilt=]dpm, --quilt=unpatched." +"push; all builds. And it is only effective when split view is actually in " +"operation." msgstr "" #. type: Plain text -#: ../dgit.1:764 +#: ../dgit.1:773 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:768 +#: ../dgit.1:777 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:768 +#: ../dgit.1:777 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:791 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1417,13 +1429,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:782 +#: ../dgit.1:791 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:797 msgid "" "Declare that you are deliberately rewinding history. When pushing to " "Debian, use this when you are making a renewed upload of an entirely new " @@ -1432,23 +1444,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:799 +#: ../dgit.1:808 msgid "" -"In split view quilt modes, this also prevents the construction by dgit of a " -"pseudomerge to make the dgit view fast forwarding. Normally only one of --" -"overwrite (which creates a suitable pseudomerge) and --deliberately-not-" -"fast-forward (which suppresses the pseudomerge and the fast forward checks) " -"should be needed; --overwrite is usually better." +"When split view is in operation, this also prevents the construction by dgit " +"of a pseudomerge to make the dgit view fast forwarding. Normally only one " +"of --overwrite (which creates a suitable pseudomerge) and --deliberately-" +"not-fast-forward (which suppresses the pseudomerge and the fast forward " +"checks) should be needed; --overwrite is usually better." msgstr "" #. type: TP -#: ../dgit.1:799 +#: ../dgit.1:808 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:808 +#: ../dgit.1:817 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1460,27 +1472,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:808 +#: ../dgit.1:817 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:813 +#: ../dgit.1:822 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " "server will do this automatically when necessary." msgstr "" -#. type: TP -#: ../dgit.1:813 +#. type: =item +#: ../dgit.1:822 ../git-debpush.1.pod:112 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:820 +#: ../dgit.1:829 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1488,36 +1500,36 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:825 +#: ../dgit.1:834 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: TP -#: ../dgit.1:825 +#. type: =item +#: ../dgit.1:834 ../git-debpush.1.pod:124 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:834 +#: ../dgit.1:843 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " -"linear patch stack (as with --quilt=auto) but if that doesn't seem " +"linear patch stack (as with --quilt=linear) but if that doesn't seem " "possible, try to generate a single squashed patch for all the changes made " "in git (as with --quilt=smash). This is not a good idea for an NMU in " "Debian." msgstr "" -#. type: TP -#: ../dgit.1:834 +#. type: =item +#: ../dgit.1:843 ../git-debpush.1.pod:118 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:848 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1525,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:845 +#: ../dgit.1:854 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1533,14 +1545,14 @@ msgid "" "remain true.)" msgstr "" -#. type: TP -#: ../dgit.1:845 +#. type: =item +#: ../dgit.1:854 ../git-debpush.1.pod:129 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:853 +#: ../dgit.1:862 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1549,13 +1561,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:853 +#: ../dgit.1:862 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:858 +#: ../dgit.1:867 msgid "" "Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " "If you use this option and the metadata did in fact need fixing up, dgit " @@ -1563,20 +1575,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:858 +#: ../dgit.1:867 #, no-wrap -msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>" +msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:865 +#: ../dgit.1:874 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:873 +#: ../dgit.1:878 +msgid "" +"These quilt modes are known as B<splitting quilt modes>. See --split-view, " +"below." +msgstr "" + +#. type: Plain text +#: ../dgit.1:886 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1585,7 +1604,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:881 +#: ../dgit.1:894 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1593,7 +1612,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:886 +#: ../dgit.1:899 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1601,20 +1620,44 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:904 +#: ../dgit.1:913 msgid "" -"With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " -"and build) will automatically generate a conversion of your git branch into " -"the right form. dgit push will push the dgit-compatible form (the B<dgit " -"view>) to the dgit git server. The dgit view will be visible to you in the " -"dgit remote tracking branches, but your own branch will not be modified. " -"dgit push will create a tag B<debian/>I<version> for the maintainer view, " -"and the dgit tag B<archive/debian/>I<version> for the dgit view. dgit quilt-" -"fixup will merely do some checks, and cache the maintainer view." +"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " +"that your HEAD contains only a debian/ directory, with any changes to " +"upstream files represented as patches in debian/patches. The upstream " +"source must be available in git, by default, in a suitably named git tag; " +"see --upstream-commitish. In this mode, dgit cannot check that all edited " +"upstream files are properly represented as patches: dgit relies on debian/" +"patches being correct." msgstr "" #. type: Plain text -#: ../dgit.1:913 +#: ../dgit.1:924 +msgid "" +"B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " +"there is no appropriate upstream git history. To construct the dgit view, " +"dgit will import your orig tarballs' contents into git. In this mode, dgit " +"cannot check that the upstream parts of your upload correspond to what you " +"intend: dgit relies on the right orig tarball(s) existing, and debian/" +"patches being correct." +msgstr "" + +#. type: Plain text +#: ../dgit.1:942 +msgid "" +"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " +"quilt-fixup and build) will automatically generate a conversion of your git " +"branch into the right form. dgit push will push the dgit-compatible form " +"(the B<dgit view>) to the dgit git server. The dgit view will be visible " +"to you in the dgit remote tracking branches, but your own branch will not be " +"modified. dgit push will create a tag B<debian/>I<version> for the " +"maintainer view, and the dgit tag B<archive/debian/>I<version> for the dgit " +"view. dgit quilt-fixup will merely do some checks, and cache the maintainer " +"view." +msgstr "" + +#. type: Plain text +#: ../dgit.1:951 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1626,13 +1669,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:913 +#: ../dgit.1:951 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:960 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1642,7 +1685,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:928 +#: ../dgit.1:966 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1651,7 +1694,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:933 +#: ../dgit.1:971 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1659,13 +1702,70 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:933 +#: ../dgit.1:971 +#, no-wrap +msgid "B<--split-view=auto>|B<always>|B<never>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:976 +msgid "" +"Controls whether dgit operates a split view, separating your own branch (as " +"Debian maintainer) from that shown to users of dgit clone and dgit fetch." +msgstr "" + +#. type: Plain text +#: ../dgit.1:984 +msgid "" +"When split view is in operation dgit will not make or merge any commits onto " +"your own branch. Specifically, only the dgit view will contain dgit's " +"pseudomerges, which bring into the git history previous uploads made with " +"dgit push, and any commits in debian/patches required to make a correct `3.0 " +"(quilt)' source package." +msgstr "" + +#. type: Plain text +#: ../dgit.1:990 +msgid "" +"B<auto> is the default, and splits the view only when needed: i.e., when you " +"are working with a `3.0 (quilt)' source package and a splitting quilt mode: " +"--[quilt=]gbp, dpm, unpatched or baredebian*." +msgstr "" + +#. type: Plain text +#: ../dgit.1:993 +msgid "" +"B<always> splits the view regardless of the source format and the quilt mode." +msgstr "" + +#. type: Plain text +#: ../dgit.1:996 +msgid "B<never> will cause dgit to fail if split view is needed." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1004 +msgid "" +"When split view is in operation, the dgit view is visible in your local git " +"clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" +">I<suite> and B<archive/>I<distro>B</>I<version>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1007 +msgid "" +"Note that split view does not affect dgit fetch, and is not compatible with " +"dgit pull." +msgstr "" + +#. type: TP +#: ../dgit.1:1007 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:938 +#: ../dgit.1:1012 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1673,7 +1773,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:947 +#: ../dgit.1:1021 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1681,13 +1781,28 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:947 +#: ../dgit.1:1021 +#, no-wrap +msgid "B<--upstream-commitish=>I<upstream>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1029 +msgid "" +"For use with --quilt=baredebian only. Specifies the commit containing the " +"upstream source. This commit must be identical to your .orig tarball. The " +"default is to look for one of the git tags I<U>B< v>I<U>B< upstream/>I<U> " +"(in that order), where U is the upstream version." +msgstr "" + +#. type: TP +#: ../dgit.1:1029 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:959 +#: ../dgit.1:1041 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1699,32 +1814,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:962 +#: ../dgit.1:1044 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:962 +#: ../dgit.1:1044 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:966 +#: ../dgit.1:1048 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1051 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:1060 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1733,90 +1848,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:978 +#: ../dgit.1:1060 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:981 +#: ../dgit.1:1063 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:981 +#: ../dgit.1:1063 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:988 +#: ../dgit.1:1070 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " -"B<archive/debian/>I<version>) where possible. This is the default." +"B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:988 +#: ../dgit.1:1070 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:994 -msgid "" -"Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " -"where only the old tag format is supported, the dgit tag will have the " -"DEP-14 name. This option does not prevent that.)" +#: ../dgit.1:1073 +msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:994 +#: ../dgit.1:1073 #, no-wrap -msgid "B<--dep14tag-always>" +msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:999 -msgid "" -"Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " -"not support that, dgit push will fail." +#: ../dgit.1:1076 +msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:999 +#: ../dgit.1:1076 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1003 +#: ../dgit.1:1080 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1003 +#: ../dgit.1:1080 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1007 +#: ../dgit.1:1084 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1007 +#: ../dgit.1:1084 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1093 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1826,7 +1936,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1022 +#: ../dgit.1:1099 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1834,30 +1944,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1022 +#: ../dgit.1:1099 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1025 +#: ../dgit.1:1102 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1025 +#: ../dgit.1:1102 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1029 +#: ../dgit.1:1106 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1036 +#: ../dgit.1:1113 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1865,18 +1975,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1038 +#: ../dgit.1:1115 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1038 +#: ../dgit.1:1115 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1137 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1886,7 +1996,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1068 +#: ../dgit.1:1145 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -1895,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1073 +#: ../dgit.1:1150 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -1903,7 +2013,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1077 +#: ../dgit.1:1154 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -1911,39 +2021,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1156 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1087 +#: ../dgit.1:1164 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1087 +#: ../dgit.1:1164 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1170 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1098 +#: ../dgit.1:1175 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1105 +#: ../dgit.1:1182 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -1951,13 +2061,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1105 +#: ../dgit.1:1182 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1128 +#: ../dgit.1:1205 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1967,14 +2077,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1136 +#: ../dgit.1:1213 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1143 +#: ../dgit.1:1220 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -1983,7 +2093,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1231 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -1993,7 +2103,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1162 +#: ../dgit.1:1239 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2001,7 +2111,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1256 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2013,13 +2123,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1179 +#: ../dgit.1:1256 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1189 +#: ../dgit.1:1266 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2030,19 +2140,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1189 +#: ../dgit.1:1266 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1192 +#: ../dgit.1:1269 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1201 +#: ../dgit.1:1278 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2052,13 +2162,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1201 +#: ../dgit.1:1278 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1209 +#: ../dgit.1:1286 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2067,13 +2177,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1209 +#: ../dgit.1:1286 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1216 +#: ../dgit.1:1293 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2081,26 +2191,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1216 +#: ../dgit.1:1293 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1221 +#: ../dgit.1:1298 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1221 +#: ../dgit.1:1298 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1227 +#: ../dgit.1:1304 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2108,13 +2218,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1227 +#: ../dgit.1:1304 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1234 +#: ../dgit.1:1311 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2122,65 +2232,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1234 +#: ../dgit.1:1311 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1239 +#: ../dgit.1:1316 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1239 +#: ../dgit.1:1316 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1243 +#: ../dgit.1:1320 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1243 +#: ../dgit.1:1320 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1247 +#: ../dgit.1:1324 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1247 +#: ../dgit.1:1324 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1253 +#: ../dgit.1:1330 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: =head1 -#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1330 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1259 +#: ../dgit.1:1336 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2188,31 +2298,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1261 +#: ../dgit.1:1338 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1261 +#: ../dgit.1:1338 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1267 +#: ../dgit.1:1344 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1344 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1272 +#: ../dgit.1:1349 msgid "" "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 " @@ -2220,66 +2330,66 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1275 +#: ../dgit.1:1352 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1275 +#: ../dgit.1:1352 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1278 +#: ../dgit.1:1355 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1355 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1281 +#: ../dgit.1:1358 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1281 +#: ../dgit.1:1358 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1286 +#: ../dgit.1:1363 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1286 +#: ../dgit.1:1363 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1290 +#: ../dgit.1:1367 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1290 +#: ../dgit.1:1367 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1296 +#: ../dgit.1:1373 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2287,39 +2397,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1296 +#: ../dgit.1:1373 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1300 +#: ../dgit.1:1377 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1300 +#: ../dgit.1:1377 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.split-view>" +msgstr "" + +#. type: TP +#: ../dgit.1:1379 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1304 +#: ../dgit.1:1383 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1304 +#: ../dgit.1:1383 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1311 +#: ../dgit.1:1390 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2328,52 +2444,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1311 +#: ../dgit.1:1390 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1315 +#: ../dgit.1:1394 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1315 +#: ../dgit.1:1394 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1317 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1399 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1399 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1323 +#: ../dgit.1:1402 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1323 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1328 +#: ../dgit.1:1407 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2381,26 +2497,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1328 +#: ../dgit.1:1407 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1332 +#: ../dgit.1:1411 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1332 +#: ../dgit.1:1411 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1337 +#: ../dgit.1:1416 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2408,13 +2524,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1337 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1343 +#: ../dgit.1:1422 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2422,24 +2538,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1343 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1349 +#: ../dgit.1:1428 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1349 +#: ../dgit.1:1428 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1361 +#: ../dgit.1:1440 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2449,13 +2565,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1361 +#: ../dgit.1:1440 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1445 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2464,204 +2580,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1366 +#: ../dgit.1:1445 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1369 +#: ../dgit.1:1448 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1369 +#: ../dgit.1:1448 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1372 +#: ../dgit.1:1451 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1372 +#: ../dgit.1:1451 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1378 +#: ../dgit.1:1457 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1378 +#: ../dgit.1:1457 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1380 +#: ../dgit.1:1459 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1461 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1384 +#: ../dgit.1:1463 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1386 +#: ../dgit.1:1465 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1388 +#: ../dgit.1:1467 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1390 +#: ../dgit.1:1469 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1392 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1394 +#: ../dgit.1:1473 #, no-wrap -msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname> | B<aptget:>" +msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1475 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1398 +#: ../dgit.1:1477 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1400 +#: ../dgit.1:1479 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1481 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1404 +#: ../dgit.1:1483 #, no-wrap -msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" +msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1406 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1408 +#: ../dgit.1:1487 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1410 +#: ../dgit.1:1489 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1412 +#: ../dgit.1:1491 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1414 +#: ../dgit.1:1493 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1495 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1418 +#: ../dgit.1:1497 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1420 +#: ../dgit.1:1499 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1501 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1424 +#: ../dgit.1:1503 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1426 +#: ../dgit.1:1505 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1428 +#: ../dgit.1:1507 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1429 +#: ../dgit.1:1508 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1438 +#: ../dgit.1:1517 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2671,26 +2787,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1438 +#: ../dgit.1:1517 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1442 +#: ../dgit.1:1521 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1442 +#: ../dgit.1:1521 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1447 +#: ../dgit.1:1526 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2698,13 +2814,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1447 +#: ../dgit.1:1526 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1533 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2712,7 +2828,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1460 +#: ../dgit.1:1539 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2720,7 +2836,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1465 +#: ../dgit.1:1544 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2729,7 +2845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1470 +#: ../dgit.1:1549 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2737,24 +2853,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1479 +#: ../dgit.1:1558 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1480 +#: ../dgit.1:1559 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index 1329e77..f41a2b8 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,18 +33,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -642,7 +644,7 @@ msgstr "" #. type: SH #: ../dgit.7:396 #, no-wrap -msgid "SPLIT VIEW QUILT MODE" +msgid "SPLIT VIEW AND SPLITTING QUILT MODES" msgstr "" #. type: Plain text @@ -656,51 +658,61 @@ msgstr "" #. type: Plain text #: ../dgit.7:410 msgid "" -"When a split view mode is engaged dgit build commands and dgit push will, on " -"each invocation, convert the user's HEAD into the dgit view, so that it can " -"be built and/or uploaded." +"When a splitting quilt mode is selected dgit build commands and dgit push " +"will, on each invocation, convert the user's HEAD into the dgit view, so " +"that it can be built and/or uploaded." msgstr "" #. type: Plain text -#: ../dgit.7:417 +#: ../dgit.7:416 msgid "" -"dgit push in split view mode will push the dgit view to the dgit git " -"server. The dgit view is always a descendant of the maintainer view. dgit " -"push will also make a maintainer view tag according to DEP-14 and push that " -"to the dgit git server." +"Split view mode can also be enabled explicitly with the --split-view command " +"line option and the .split-view access configuration key." msgstr "" #. type: Plain text -#: ../dgit.7:425 +#: ../dgit.7:429 msgid "" -"Split view mode must be enabled explicitly (by the use of the applicable " -"command line options, subcommands, or configuration). This is because it is " -"not possible to reliably tell (for example) whether a git tree for a dpkg-" -"source `3.0 (quilt)' package is a patches-applied or patches-unapplied tree." +"When split view is in operation, regardless of the quilt mode, any dgit-" +"generated pseudomerges and any quilt fixup commits will appear only in the " +"dgit view. dgit push will push the dgit view to the dgit git server. The " +"dgit view is always a descendant of the maintainer view. dgit push will " +"also make a maintainer view tag according to DEP-14 and push that to the " +"dgit git server." msgstr "" #. type: Plain text -#: ../dgit.7:429 +#: ../dgit.7:437 +msgid "" +"Splitting quilt modes must be enabled explicitly (by the use of the " +"applicable command line options, subcommands, or configuration). This is " +"because it is not possible to reliably tell (for example) whether a git " +"tree for a dpkg-source `3.0 (quilt)' package is a patches-applied or patches-" +"unapplied tree." +msgstr "" + +#. type: Plain text +#: ../dgit.7:441 msgid "" "Split view conversions are cached in the ref dgit-intern/quilt-cache. This " "should not be manipulated directly." msgstr "" #. type: SH -#: ../dgit.7:429 +#: ../dgit.7:441 #, no-wrap msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:432 +#: ../dgit.7:444 msgid "" "This section is mainly of interest to maintainers who want to use dgit with " "their existing git history for the Debian package." msgstr "" #. type: Plain text -#: ../dgit.7:438 +#: ../dgit.7:450 msgid "" "Some developers like to have an extra-clean git tree which lacks files which " "are normally found in source tarballs and therefore in Debian source " @@ -710,7 +722,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:443 +#: ../dgit.7:455 msgid "" "dgit requires that the source package unpacks to exactly the same files as " "are in the git commit on which dgit push operates. So if you just try to " @@ -718,18 +730,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:445 +#: ../dgit.7:457 msgid "As the maintainer you therefore have the following options:" msgstr "" #. type: TP -#: ../dgit.7:445 ../dgit.7:456 ../dgit.7:505 ../dgit.7:513 +#: ../dgit.7:457 ../dgit.7:468 ../dgit.7:517 ../dgit.7:525 #, no-wrap msgid "\\(bu" msgstr "" #. type: Plain text -#: ../dgit.7:456 +#: ../dgit.7:468 msgid "" "Delete the files from your git branches, and your Debian source packages, " "and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this " @@ -740,7 +752,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:462 +#: ../dgit.7:474 msgid "" "Persuade upstream that the source code in their git history and the source " "they ship as tarballs should be identical. Of course simply removing the " @@ -748,7 +760,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:468 +#: ../dgit.7:480 msgid "" "One answer is to commit the (maybe autogenerated) files, perhaps with some " "simple automation to deal with conflicts and spurious changes. This has the " @@ -757,7 +769,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:473 +#: ../dgit.7:485 msgid "" "Of course it may also be that the differences are due to build system bugs, " "which cause unintended files to end up in the source package. dgit will " @@ -766,13 +778,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:474 +#: ../dgit.7:486 #, no-wrap msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC." msgstr "" #. type: Plain text -#: ../dgit.7:478 +#: ../dgit.7:490 msgid "" "Some upstream tarballs contain build artifacts which upstream expects some " "users not to want to rebuild (or indeed to find hard to rebuild), but which " @@ -780,7 +792,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:488 +#: ../dgit.7:500 msgid "" "Examples sometimes include crossbuild firmware binaries and documentation. " "To avoid problems when building updated source packages (in particular, to " @@ -790,7 +802,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:496 +#: ../dgit.7:508 msgid "" "dpkg-source does not (with any of the commonly used source formats) " "represent deletion of binaries (outside debian/) present in upstream. Thus " @@ -800,7 +812,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:502 +#: ../dgit.7:514 msgid "" "However, git does always properly record file deletion. Since dgit's " "principle is that the dgit git tree is the same of dpkg-source -x, that " @@ -808,14 +820,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:505 +#: ../dgit.7:517 msgid "" "For the non-maintainer, this can be observed in the following suboptimal " "occurrences:" msgstr "" #. type: Plain text -#: ../dgit.7:513 +#: ../dgit.7:525 msgid "" "The package clean target often deletes these files, making the git tree " "dirty trying to build the source package, etc. This can be fixed by using " @@ -824,7 +836,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:520 +#: ../dgit.7:532 msgid "" "The package build modifies these files, so that builds make the git tree " "dirty. This can be worked around by using `git reset --hard' after each " @@ -832,7 +844,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:530 +#: ../dgit.7:542 msgid "" "From the maintainer's point of view, the main consequence is that to make a " "dgit-compatible git branch it is necessary to commit these files to git. " @@ -843,13 +855,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:530 +#: ../dgit.7:542 #, no-wrap msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:538 +#: ../dgit.7:550 msgid "" "A related problem is other unexpected behaviour by a package's B<clean> " "target. If a package's rules modify files which are distributed in the " @@ -858,7 +870,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:546 +#: ../dgit.7:558 msgid "" "Again, the solution is to use B<dgit -wg> aka B<--clean=git>, which " "instructs dgit to use git clean instead of the package's build target, along " @@ -866,7 +878,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:550 +#: ../dgit.7:562 msgid "" "This is 100% reliable, but has the downside that if you forget to git add or " "to commit, and then use B<dgit -wg> or B<git reset --hard>, your changes may " diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 0697082..8c08286 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,7 +21,8 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" @@ -33,12 +34,13 @@ msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -47,7 +49,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -921,7 +923,7 @@ msgstr "" #. type: =item #: ../git-debrebase.1.pod:534 -msgid "--experimntal-merge-resolution" +msgid "--experimental-merge-resolution" msgstr "" #. type: textblock @@ -1045,5 +1047,5 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:621 -msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)" +msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index 71601b1..dd07290 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,10 +43,15 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:11 ../git-debrebase.5.pod:37 +msgid "TERMINOLOGY" +msgstr "" + #. type: textblock #: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 msgid "" @@ -96,11 +103,6 @@ msgid "" "output than the default." msgstr "" -#. type: =head1 -#: ../git-debrebase.5.pod:37 -msgid "TERMINOLOGY" -msgstr "" - #. type: =item #: ../git-debrebase.5.pod:41 msgid "Pseudomerge" @@ -620,7 +622,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:394 msgid "" -"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours " +"See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours " "should be be avoided because they might generate such merges." msgstr "" |