diff options
Diffstat (limited to 'po4a/dgit-maint-debrebase_7.pot')
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 387 |
1 files changed, 218 insertions, 169 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 "" |