diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-29 00:50:06 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-29 00:50:06 +0000 |
| commit | 1b28f7117ac33dc0f20582ca8814b719aed17e9f (patch) | |
| tree | 2f509a37a58c62e737e36fb278aa440f058c4020 | |
| parent | db39b13ffc43caefdafbc5c252230fe202835043 (diff) | |
i18n-commit - autogenerated
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 364 | ||||
| -rw-r--r-- | po4a/dgit-maint-gbp_7.pot | 50 | ||||
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 295 | ||||
| -rw-r--r-- | po4a/dgit-maint-native_7.pot | 55 | ||||
| -rw-r--r-- | po4a/dgit-nmu-simple_7.pot | 22 | ||||
| -rw-r--r-- | po4a/dgit-sponsorship_7.pot | 43 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 1073 | ||||
| -rw-r--r-- | po4a/dgit_7.pot | 87 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 77 |
9 files changed, 1165 insertions, 901 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 3410d8b..eed6cd5 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\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" @@ -28,12 +28,12 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../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:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -68,9 +68,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 -#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:354 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 +#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -108,8 +108,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -165,15 +165,23 @@ msgstr "" msgid "to obtain a release tag, and then proceed as above." msgstr "" +#. type: verbatim +#: ../dgit-maint-merge.7.pod:151 ../dgit-maint-debrebase.7.pod:165 +#, no-wrap +msgid "" +" % git tag -s upstream/$(git show --date=format:%Y%m%d --pretty=format:\"1.2.2+git%cd.%h\" --quiet upstream/main) upstream/main\n" +"\n" +msgstr "" + #. type: =head3 -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 -#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 -#: ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:489 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" @@ -184,7 +192,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -194,7 +202,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -203,19 +211,19 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:223 ../dgit-maint-debrebase.7.pod:243 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 +#: ../dgit-maint-merge.7.pod:225 ../dgit-maint-debrebase.7.pod:245 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:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-merge.7.pod:264 ../dgit-maint-debrebase.7.pod:276 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -223,24 +231,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 +#: ../dgit-maint-merge.7.pod:277 ../dgit-maint-debrebase.7.pod:330 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:339 ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -248,7 +256,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 +#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:370 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 " @@ -256,7 +264,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 +#: ../dgit-maint-merge.7.pod:399 ../dgit-maint-debrebase.7.pod:376 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 " @@ -265,12 +273,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -278,12 +286,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -291,7 +299,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 +#: ../dgit-maint-merge.7.pod:452 ../dgit-maint-debrebase.7.pod:423 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 " @@ -299,12 +307,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-debrebase.7.pod:591 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>. " @@ -313,20 +321,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../dgit-maint-merge.7.pod:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 +#: ../dgit-maint-merge.7.pod:553 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -334,7 +342,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:326 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:334 msgid "GIT CONFIGURATION" msgstr "" @@ -467,14 +475,20 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:165 +#: ../dgit-maint-debrebase.7.pod:161 +msgid "" +"One can generate such a versioned tag using git show's --pretty option. e.g.:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:173 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: verbatim -#: ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:179 #, no-wrap msgid "" " % mkdir foo\n" @@ -491,7 +505,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:184 +#: ../dgit-maint-debrebase.7.pod:192 msgid "" "This should leave you on the master branch. Next, our upstream branch " "cannot be pushed to B<dgit-repos>, but since we will need it whenever we " @@ -500,7 +514,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:196 +#: ../dgit-maint-debrebase.7.pod:204 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 " @@ -510,14 +524,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:203 +#: ../dgit-maint-debrebase.7.pod:211 msgid "" "A convenient way to ensure this requirement is satisfied is to start by " "creating I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:217 +#: ../dgit-maint-debrebase.7.pod:225 #, no-wrap msgid "" " [import-orig]\n" @@ -526,12 +540,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:222 +#: ../dgit-maint-debrebase.7.pod:230 msgid "and commit that:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:226 +#: ../dgit-maint-debrebase.7.pod:234 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -539,7 +553,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:230 +#: ../dgit-maint-debrebase.7.pod:238 msgid "" "Note that we couldn't create I<debian/gbp.conf> before now for the same " "technical reasons which require our first commit to introduce I<debian/> " @@ -548,7 +562,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-debrebase.7.pod:248 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 " @@ -557,7 +571,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:247 +#: ../dgit-maint-debrebase.7.pod:255 #, no-wrap msgid "" " % git clone salsa.debian.org:Debian/foo\n" @@ -568,14 +582,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:254 +#: ../dgit-maint-debrebase.7.pod:262 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:259 +#: ../dgit-maint-debrebase.7.pod:267 #, no-wrap msgid "" " % dgit clone foo\n" @@ -584,12 +598,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:264 +#: ../dgit-maint-debrebase.7.pod:272 msgid "Then we make new upstream tags available:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:272 +#: ../dgit-maint-debrebase.7.pod:280 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 " @@ -597,17 +611,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:278 +#: ../dgit-maint-debrebase.7.pod:286 msgid "(A) There is no delta queue." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:280 +#: ../dgit-maint-debrebase.7.pod:288 msgid "If there do not exist any Debian patches, use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:284 ../dgit-maint-debrebase.7.pod:296 +#: ../dgit-maint-debrebase.7.pod:292 ../dgit-maint-debrebase.7.pod:304 #, no-wrap msgid "" " % git debrebase convert-from-gbp\n" @@ -615,12 +629,12 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:288 +#: ../dgit-maint-debrebase.7.pod:296 msgid "(B) There is a delta queue, and patches are unapplied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:290 +#: ../dgit-maint-debrebase.7.pod:298 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. " @@ -628,7 +642,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:300 +#: ../dgit-maint-debrebase.7.pod:308 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 " @@ -637,17 +651,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:305 +#: ../dgit-maint-debrebase.7.pod:313 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:307 +#: ../dgit-maint-debrebase.7.pod:315 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:311 +#: ../dgit-maint-debrebase.7.pod:319 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -655,7 +669,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:317 +#: ../dgit-maint-debrebase.7.pod:325 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-" @@ -663,7 +677,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:328 +#: ../dgit-maint-debrebase.7.pod:336 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 " @@ -671,7 +685,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:335 +#: ../dgit-maint-debrebase.7.pod:343 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -679,14 +693,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:339 +#: ../dgit-maint-debrebase.7.pod:347 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:342 +#: ../dgit-maint-debrebase.7.pod:350 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 " @@ -695,24 +709,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:347 +#: ../dgit-maint-debrebase.7.pod:355 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:349 +#: ../dgit-maint-debrebase.7.pod:357 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:389 +#: ../dgit-maint-debrebase.7.pod:397 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-debrebase.7.pod:401 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -720,12 +734,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:397 -msgid "replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball." -msgstr "" - -#. type: textblock -#: ../dgit-maint-debrebase.7.pod:399 +#: ../dgit-maint-debrebase.7.pod:405 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 " @@ -733,13 +742,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:403 +#: ../dgit-maint-debrebase.7.pod:409 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:408 +#: ../dgit-maint-debrebase.7.pod:414 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -747,7 +756,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:412 +#: ../dgit-maint-debrebase.7.pod:418 msgid "" "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 " @@ -756,27 +765,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:427 +#: ../dgit-maint-debrebase.7.pod:433 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:429 +#: ../dgit-maint-debrebase.7.pod:435 msgid "Just make commits on master that change the contents of I<debian/>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:431 +#: ../dgit-maint-debrebase.7.pod:437 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:433 +#: ../dgit-maint-debrebase.7.pod:439 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:441 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-" @@ -784,19 +793,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:439 +#: ../dgit-maint-debrebase.7.pod:445 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:441 +#: ../dgit-maint-debrebase.7.pod:447 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:446 ../dgit-maint-debrebase.7.pod:749 +#: ../dgit-maint-debrebase.7.pod:452 ../dgit-maint-debrebase.7.pod:759 #, no-wrap msgid "" " % git debrebase -i\n" @@ -804,35 +813,35 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:450 +#: ../dgit-maint-debrebase.7.pod:456 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:453 +#: ../dgit-maint-debrebase.7.pod:459 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:455 +#: ../dgit-maint-debrebase.7.pod:461 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 " -"branch anywhere. If you are ready to upload, B<dgit push> or B<dgit push-" -"source> will take care of fixing this up for you." +"branch anywhere. If you are ready to upload, B<dgit push-source> (or B<dgit " +"push-built>) will take care of fixing this up for you." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-debrebase.7.pod:467 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:466 +#: ../dgit-maint-debrebase.7.pod:472 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -840,7 +849,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:470 +#: ../dgit-maint-debrebase.7.pod:476 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 " @@ -850,7 +859,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:478 +#: ../dgit-maint-debrebase.7.pod:484 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 " @@ -858,14 +867,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:482 +#: ../dgit-maint-debrebase.7.pod:488 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." +"Upload with B<dgit push-source> or B<dgit push-built>. Remember to pass I<--" +"new> if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:485 +#: ../dgit-maint-debrebase.7.pod:491 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-" @@ -875,7 +884,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:491 +#: ../dgit-maint-debrebase.7.pod:497 +msgid "" +"If you want to upload with git-debpush(1), for the first upload you should " +"pass the B<--quilt=linear> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:501 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 " @@ -883,7 +899,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:497 +#: ../dgit-maint-debrebase.7.pod:507 #, no-wrap msgid "" " % git debrebase\n" @@ -892,24 +908,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:502 +#: ../dgit-maint-debrebase.7.pod:512 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:504 +#: ../dgit-maint-debrebase.7.pod:514 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:509 +#: ../dgit-maint-debrebase.7.pod:519 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:511 +#: ../dgit-maint-debrebase.7.pod:521 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 " @@ -917,7 +933,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:515 +#: ../dgit-maint-debrebase.7.pod:525 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -929,12 +945,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-debrebase.7.pod:531 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:523 +#: ../dgit-maint-debrebase.7.pod:533 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 " @@ -943,12 +959,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:529 +#: ../dgit-maint-debrebase.7.pod:539 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:533 +#: ../dgit-maint-debrebase.7.pod:543 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -960,14 +976,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:541 +#: ../dgit-maint-debrebase.7.pod:551 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:546 +#: ../dgit-maint-debrebase.7.pod:556 #, no-wrap msgid "" " % git branch --unset-upstream\n" @@ -976,18 +992,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:551 +#: ../dgit-maint-debrebase.7.pod:561 msgid "and proceed with \"INITIAL DEBIANISATION\"." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:563 msgid "" "For subsequent releases (whether or not they require additional filtering):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:558 +#: ../dgit-maint-debrebase.7.pod:568 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -1001,7 +1017,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:568 +#: ../dgit-maint-debrebase.7.pod:578 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 " @@ -1010,7 +1026,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:575 +#: ../dgit-maint-debrebase.7.pod:585 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -1018,17 +1034,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:579 +#: ../dgit-maint-debrebase.7.pod:589 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:588 +#: ../dgit-maint-debrebase.7.pod:598 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:592 +#: ../dgit-maint-debrebase.7.pod:602 #, no-wrap msgid "" " % dgit fetch\n" @@ -1037,7 +1053,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:597 +#: ../dgit-maint-debrebase.7.pod:607 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 " @@ -1045,7 +1061,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:601 +#: ../dgit-maint-debrebase.7.pod:611 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 " @@ -1053,12 +1069,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:605 +#: ../dgit-maint-debrebase.7.pod:615 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:609 +#: ../dgit-maint-debrebase.7.pod:619 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -1066,14 +1082,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:613 +#: ../dgit-maint-debrebase.7.pod:623 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:616 +#: ../dgit-maint-debrebase.7.pod:626 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 " @@ -1081,12 +1097,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:620 +#: ../dgit-maint-debrebase.7.pod:630 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:622 +#: ../dgit-maint-debrebase.7.pod:632 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 " @@ -1094,24 +1110,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:627 +#: ../dgit-maint-debrebase.7.pod:637 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:629 +#: ../dgit-maint-debrebase.7.pod:639 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:631 +#: ../dgit-maint-debrebase.7.pod:641 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:634 +#: ../dgit-maint-debrebase.7.pod:644 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." @@ -1119,7 +1135,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:638 +#: ../dgit-maint-debrebase.7.pod:648 msgid "" "It is possible, though much less convenient, to reduce the number of " "pseudomerges yet further. We debrebase only (i) when importing a new " @@ -1131,12 +1147,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:646 +#: ../dgit-maint-debrebase.7.pod:656 msgid "The debian/patches directory" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:648 +#: ../dgit-maint-debrebase.7.pod:658 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 " @@ -1144,7 +1160,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:653 +#: ../dgit-maint-debrebase.7.pod:663 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 " @@ -1154,17 +1170,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:659 +#: ../dgit-maint-debrebase.7.pod:669 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:661 +#: ../dgit-maint-debrebase.7.pod:671 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:673 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1173,7 +1189,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:679 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 " @@ -1182,19 +1198,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:685 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:678 +#: ../dgit-maint-debrebase.7.pod:688 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:680 +#: ../dgit-maint-debrebase.7.pod:690 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 " @@ -1204,12 +1220,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:686 +#: ../dgit-maint-debrebase.7.pod:696 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:688 +#: ../dgit-maint-debrebase.7.pod:698 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 " @@ -1217,12 +1233,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:692 +#: ../dgit-maint-debrebase.7.pod:702 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:696 +#: ../dgit-maint-debrebase.7.pod:706 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1230,17 +1246,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:698 +#: ../dgit-maint-debrebase.7.pod:708 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:702 +#: ../dgit-maint-debrebase.7.pod:712 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:704 +#: ../dgit-maint-debrebase.7.pod:714 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1248,12 +1264,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:706 +#: ../dgit-maint-debrebase.7.pod:716 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:708 +#: ../dgit-maint-debrebase.7.pod:718 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1261,12 +1277,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:710 +#: ../dgit-maint-debrebase.7.pod:720 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:714 +#: ../dgit-maint-debrebase.7.pod:724 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1274,7 +1290,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:716 +#: ../dgit-maint-debrebase.7.pod:726 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. --" @@ -1282,12 +1298,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:723 +#: ../dgit-maint-debrebase.7.pod:733 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:727 +#: ../dgit-maint-debrebase.7.pod:737 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1295,17 +1311,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:729 +#: ../dgit-maint-debrebase.7.pod:739 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:733 +#: ../dgit-maint-debrebase.7.pod:743 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:735 +#: ../dgit-maint-debrebase.7.pod:745 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1314,12 +1330,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:738 +#: ../dgit-maint-debrebase.7.pod:748 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:740 +#: ../dgit-maint-debrebase.7.pod:750 #, no-wrap msgid "" " % git debrebase status\n" @@ -1327,24 +1343,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:742 +#: ../dgit-maint-debrebase.7.pod:752 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:744 +#: ../dgit-maint-debrebase.7.pod:754 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:753 +#: ../dgit-maint-debrebase.7.pod:763 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:757 +#: ../dgit-maint-debrebase.7.pod:767 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1352,7 +1368,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:762 +#: ../dgit-maint-debrebase.7.pod:772 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 " @@ -1360,7 +1376,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:768 +#: ../dgit-maint-debrebase.7.pod:778 #, no-wrap msgid "" " % git debrebase\n" @@ -1369,7 +1385,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:773 +#: ../dgit-maint-debrebase.7.pod:783 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 " @@ -1379,6 +1395,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:784 +#: ../dgit-maint-debrebase.7.pod:794 msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" msgstr "" diff --git a/po4a/dgit-maint-gbp_7.pot b/po4a/dgit-maint-gbp_7.pot index d1daa27..f991710 100644 --- a/po4a/dgit-maint-gbp_7.pot +++ b/po4a/dgit-maint-gbp_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: 2022-12-29 00:50+0000\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:1394 ../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.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, 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.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -51,8 +53,8 @@ msgid "BUILDING" 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-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" @@ -65,14 +67,15 @@ 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:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" 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:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" @@ -108,7 +111,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:334 msgid "GIT CONFIGURATION" msgstr "" @@ -235,7 +238,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:105 +#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:173 #, no-wrap msgid "" " % dgit --gbp push-source\n" @@ -248,7 +251,7 @@ msgid "or if you need to include binaries," msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#: ../dgit-maint-gbp.7.pod:113 #, no-wrap msgid "" " % dgit --gbp push\n" @@ -280,7 +283,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-gbp.7.pod:132 +#: ../dgit-maint-gbp.7.pod:130 +msgid "" +"Alternatively, you can use git-debpush(1). For the first upload you should " +"pass the B<--gbp> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:135 msgid "" "B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp " "branches. You can just apply the NMU diff the traditional way. The next " @@ -288,7 +298,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-gbp.7.pod:142 +#: ../dgit-maint-gbp.7.pod:145 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>." diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index b973a7a..af37e42 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\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" @@ -28,30 +28,30 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../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:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -66,13 +66,13 @@ msgid "INTRODUCTION" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:526 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:517 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:540 #, no-wrap msgid "" " % dgit pull\n" @@ -149,9 +149,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 -#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:354 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 +#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -218,8 +218,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -299,22 +299,37 @@ msgstr "" msgid "to obtain a release tag, and then proceed as above." msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:147 +msgid "" +"One can generate such a versioned tag using git show's --pretty option. e." +"g.:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:151 ../dgit-maint-debrebase.7.pod:165 +#, no-wrap +msgid "" +" % git tag -s upstream/$(git show --date=format:%Y%m%d --pretty=format:\"1.2.2+git%cd.%h\" --quiet upstream/main) upstream/main\n" +"\n" +msgstr "" + #. type: =head3 -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 -#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 -#: ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:489 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:151 +#: ../dgit-maint-merge.7.pod:159 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:156 +#: ../dgit-maint-merge.7.pod:164 #, no-wrap msgid "" " % mkdir foo\n" @@ -324,12 +339,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:162 +#: ../dgit-maint-merge.7.pod:170 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" @@ -340,7 +355,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -350,7 +365,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 +#: ../dgit-maint-merge.7.pod:183 #, no-wrap msgid "" " [import-orig]\n" @@ -360,12 +375,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:181 +#: ../dgit-maint-merge.7.pod:189 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:185 +#: ../dgit-maint-merge.7.pod:193 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -377,12 +392,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:201 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:205 #, no-wrap msgid "" " % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -390,7 +405,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:201 +#: ../dgit-maint-merge.7.pod:209 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 " @@ -398,7 +413,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -407,31 +422,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:212 +#: ../dgit-maint-merge.7.pod:220 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:215 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:223 ../dgit-maint-debrebase.7.pod:243 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 +#: ../dgit-maint-merge.7.pod:225 ../dgit-maint-debrebase.7.pod:245 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:220 +#: ../dgit-maint-merge.7.pod:228 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:224 +#: ../dgit-maint-merge.7.pod:232 #, no-wrap msgid "" " % dgit clone foo\n" @@ -441,19 +456,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:230 +#: ../dgit-maint-merge.7.pod:238 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:232 +#: ../dgit-maint-merge.7.pod:240 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:237 +#: ../dgit-maint-merge.7.pod:245 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -463,12 +478,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:243 +#: ../dgit-maint-merge.7.pod:251 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:247 +#: ../dgit-maint-merge.7.pod:255 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -477,12 +492,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:252 +#: ../dgit-maint-merge.7.pod:260 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-merge.7.pod:264 ../dgit-maint-debrebase.7.pod:276 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -490,12 +505,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:260 +#: ../dgit-maint-merge.7.pod:268 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:262 +#: ../dgit-maint-merge.7.pod:270 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'(?:^|/)\\." @@ -503,19 +518,19 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:267 +#: ../dgit-maint-merge.7.pod:275 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 +#: ../dgit-maint-merge.7.pod:277 ../dgit-maint-debrebase.7.pod:330 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:273 +#: ../dgit-maint-merge.7.pod:281 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-" @@ -526,52 +541,85 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:280 -msgid "SOURCE PACKAGE CONFIGURATION" +#: ../dgit-maint-merge.7.pod:288 +msgid "SOURCE PACKAGE AND GIT WORKING TREE CONFIGURATION" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:290 +msgid "dgit configuration" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:292 +msgid "" +"We must tell dgit not to try to maintain a linear queue of patches to the " +"upstream source:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:297 +#, no-wrap +msgid "" +" git config dgit.default.quilt-mode single\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:301 +msgid "" +"This affects only this one git tree; your other git trees for this package " +"(and co-maintainers) will need it too. Don't set it more globally, because " +"the maintainers of any other packages you work on, or send patches for, may " +"be offended by its effects." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:309 +msgid "unpleasant NMUs" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:282 +#: ../dgit-maint-merge.7.pod:311 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:284 +#: ../dgit-maint-merge.7.pod:313 msgid "" -"We set some source package options such that dgit can transparently handle " -"the \"dropping\" and \"refreshing\" of changes to the upstream source:" +"We set a source package option to help dpkg handle changes to the upstream " +"source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:290 +#: ../dgit-maint-merge.7.pod:319 #, no-wrap msgid "" -" single-debian-patch\n" " auto-commit\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:295 +#: ../dgit-maint-merge.7.pod:323 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:298 -msgid "Sample text for debian/source/patch-header" +#: ../dgit-maint-merge.7.pod:326 +msgid "Sample text for debian/README.source" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:300 +#: ../dgit-maint-merge.7.pod:328 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:305 +#: ../dgit-maint-merge.7.pod:333 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 " @@ -579,7 +627,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:309 +#: ../dgit-maint-merge.7.pod:337 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -588,7 +636,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:317 +#: ../dgit-maint-merge.7.pod:345 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -598,60 +646,51 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:323 +#: ../dgit-maint-merge.7.pod:351 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:326 +#: ../dgit-maint-merge.7.pod:354 msgid "A single combined diff, containing all the changes, follows." msgstr "" -#. type: textblock -#: ../dgit-maint-merge.7.pod:330 -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 " -"ignores debian/source/patch-header." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:334 -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 " -"might distract from more important information present in README.source." -msgstr "" - #. type: =head1 -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:341 +#: ../dgit-maint-merge.7.pod:360 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 " +"B<dgit push-source>, and B<dgit push-built> as detailed in dgit(1). If any " "command fails, dgit will provide a carefully-worded error message explaining " "what you should do. If it's not clear, file a bug against dgit. Remember " "to pass I<--new> for the first upload." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:366 msgid "" -"As an alternative to B<dgit build> and friends, you can use a tool like " +"If you want to upload with git-debpush(1), for the first upload you should " +"pass the B<--quilt=single> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:370 +msgid "" +"As another 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 " -"exactly the contents of the source package. gitpkg(1) is highly " +"exactly the contents of the source package. gitpkg(1) is highly " "configurable, and one dgit user reports using it to produce and test " "multiple source packages, from different branches corresponding to each of " "the current Debian suites." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:354 +#: ../dgit-maint-merge.7.pod:377 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), " @@ -659,17 +698,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 +#: ../dgit-maint-merge.7.pod:381 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -677,7 +716,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 +#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:370 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 " @@ -685,7 +724,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 +#: ../dgit-maint-merge.7.pod:399 ../dgit-maint-debrebase.7.pod:376 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 " @@ -694,12 +733,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -707,12 +746,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -720,17 +759,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:420 msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:399 +#: ../dgit-maint-merge.7.pod:422 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:401 +#: ../dgit-maint-merge.7.pod:424 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 " @@ -738,7 +777,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:407 +#: ../dgit-maint-merge.7.pod:430 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -746,12 +785,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:411 +#: ../dgit-maint-merge.7.pod:434 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:415 +#: ../dgit-maint-merge.7.pod:438 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -759,12 +798,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:419 +#: ../dgit-maint-merge.7.pod:442 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:446 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -774,7 +813,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 +#: ../dgit-maint-merge.7.pod:452 ../dgit-maint-debrebase.7.pod:423 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 " @@ -782,17 +821,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:443 +#: ../dgit-maint-merge.7.pod:466 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:447 +#: ../dgit-maint-merge.7.pod:470 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -805,7 +844,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:456 +#: ../dgit-maint-merge.7.pod:479 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 " @@ -813,7 +852,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:461 +#: ../dgit-maint-merge.7.pod:484 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 " @@ -822,7 +861,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-debrebase.7.pod:591 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>. " @@ -831,40 +870,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:473 +#: ../dgit-maint-merge.7.pod:496 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:475 +#: ../dgit-maint-merge.7.pod:498 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:481 +#: ../dgit-maint-merge.7.pod:504 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:485 +#: ../dgit-maint-merge.7.pod:508 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:490 +#: ../dgit-maint-merge.7.pod:513 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:495 +#: ../dgit-maint-merge.7.pod:518 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:499 +#: ../dgit-maint-merge.7.pod:522 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -878,7 +917,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:509 +#: ../dgit-maint-merge.7.pod:532 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -886,27 +925,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:521 +#: ../dgit-maint-merge.7.pod:544 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:528 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../dgit-maint-merge.7.pod:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 +#: ../dgit-maint-merge.7.pod:553 ../dgit-maint-debrebase.7.pod:798 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-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index 43d7d51..35976d3 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_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: 2022-12-29 00:50+0000\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-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.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,13 +43,13 @@ 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.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-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" @@ -126,25 +128,24 @@ msgstr "" #: ../dgit-maint-native.7.pod:61 #, no-wrap msgid "" -" % dgit -wgf sbuild -A -c sid\n" -" % dgit -wgf --overwrite push\n" +" % dgit -wgf --overwrite push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:66 +#: ../dgit-maint-native.7.pod:65 msgid "(Do not make any tags yourself: dgit push will do that.)" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:68 +#: ../dgit-maint-native.7.pod:67 msgid "" "You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit " "sbuild>; see dgit(1) for the syntax of those subcommands." msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:72 +#: ../dgit-maint-native.7.pod:71 msgid "" "The --overwrite option tells dgit that you are expecting that your git " "history is not a descendant of the history which dgit synthesised from the " @@ -152,7 +153,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:77 +#: ../dgit-maint-native.7.pod:76 msgid "" "dgit will make a merge commit on your branch but without making any code " "changes (ie, a pseudo-merge) so that your history, which will be pushed to " @@ -160,7 +161,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:85 +#: ../dgit-maint-native.7.pod:84 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " "avoid this merge commit by passing C<--deliberately-not-fast-forward> " @@ -169,30 +170,30 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:93 +#: ../dgit-maint-native.7.pod:92 msgid "SUBSEQUENT PUSHES" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:97 +#: ../dgit-maint-native.7.pod:96 #, no-wrap msgid "" -" % dgit -wgf push\n" +" % dgit -wgf push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:101 ../dgit-maint-native.7.pod:111 +#: ../dgit-maint-native.7.pod:100 ../dgit-maint-native.7.pod:110 msgid "That's it." msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:103 +#: ../dgit-maint-native.7.pod:102 msgid "INCORPORATING AN NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:540 #, no-wrap msgid "" " % dgit pull\n" @@ -200,12 +201,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:113 +#: ../dgit-maint-native.7.pod:112 msgid "Or, if you would prefer to review the changes, you can do this:" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:118 +#: ../dgit-maint-native.7.pod:117 #, no-wrap msgid "" " % dgit fetch\n" @@ -214,7 +215,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:123 +#: ../dgit-maint-native.7.pod:122 msgid "" "If you do not merge the NMU into your own git history, the next push will " "then require I<--overwrite>." diff --git a/po4a/dgit-nmu-simple_7.pot b/po4a/dgit-nmu-simple_7.pot index 691d136..cba52ed 100644 --- a/po4a/dgit-nmu-simple_7.pot +++ b/po4a/dgit-nmu-simple_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: 2022-12-29 00:50+0000\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:1394 ../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.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -107,8 +109,8 @@ msgid "" " [ run your tests ]\n" " % dch -r && git add debian/changelog && git commit -m\"Finalise NMU\"\n" " % dgit -wgf sbuild -A -c jessie\n" -" [ final tests on generated .debs ]\n" -" % dgit -wgf [--delayed=5] push jessie\n" +" [ any final tests on generated .debs ]\n" +" % dgit -wgf [--delayed=5] push-source jessie\n" " [ enter your gnupg passphrase as prompted ]\n" " [ see that push and upload are successful ]\n" " [ prepare and email NMU diff (git-diff, git-format-patch) ]\n" diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot index 08bc8f7..dd85124 100644 --- a/po4a/dgit-sponsorship_7.pot +++ b/po4a/dgit-sponsorship_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: 2022-12-29 00:50+0000\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-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.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -43,10 +45,10 @@ msgid "INTRODUCTION AND SCOPE" msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:173 #, no-wrap msgid "" -" % dgit --gbp push\n" +" % dgit --gbp push-source\n" "\n" msgstr "" @@ -105,7 +107,7 @@ msgstr "" #: ../dgit-sponsorship.7.pod:32 msgid "" "You should prepare the package as if you were going to upload it with C<dgit " -"push-source> or C<dgit push> yourself." +"push-source> or C<dgit push-built> yourself." msgstr "" #. type: textblock @@ -181,8 +183,8 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:81 msgid "" -"A sample dgit push command, containing any dgit --quilt=, --gbp or --dpm " -"option needed" +"A sample dgit push-source command, containing any dgit --quilt=, --gbp or --" +"dpm option needed" msgstr "" #. type: textblock @@ -300,7 +302,7 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:163 msgid "" -"Supply a sample \"dgit push\" command including any C<--gbp> (aka C<--" +"Supply a sample \"dgit push-source\" command including any C<--gbp> (aka C<--" "quilt=gbp>), C<--dpm> (aka C<--quilt=dpm>), or other C<--quilt=> option they " "need to use. e.g." msgstr "" @@ -412,8 +414,8 @@ msgstr "" msgid "" "When you have completed your source review, and use C<dgit -wgf [--" "quilt=...] sbuild -A -C> or similar, to to the build, and then C<dgit -wgf " -"[--quilt=...] push-source> or C<dgit -wgf [--quilt=...] push> to do the " -"upload." +"[--quilt=...] push-source> or C<dgit -wgf [--quilt=...] push-built> to do " +"the upload." msgstr "" #. type: textblock @@ -507,12 +509,13 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:307 msgid "" -"When you have finished your review and your tests, you can do the dgit " -"sbuild and dgit push directly from the \"sponsee\" branch." +"When you have finished your review and your tests, you can do the dgit push-" +"source (or dgit sbuild and dgit push-built) directly from the \"sponsee\" " +"branch." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:312 +#: ../dgit-sponsorship.7.pod:313 msgid "" "You will need to pass C<--overwrite> to dgit push for every successive " "upload. This disables a safety catch which would normally spot situations " @@ -522,6 +525,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:323 +#: ../dgit-sponsorship.7.pod:324 msgid "dgit(1), dgit(7), dgit-nmu-simple(7), dgit-maint-*(7)" msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index c7d489b..bdfca0f 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\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" @@ -75,14 +75,14 @@ msgstr "" #. type: Plain text #: ../dgit.1:26 -msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-source> [I<dgit-opts>] [I<suite>]" +msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-built> [I<dgit-opts>] [I<suite>]" msgstr "" #. type: Plain text #: ../dgit.1:30 msgid "" -"B<dgit> [I<dgit-opts>] B<rpush> I<build-host>B<:>I<build-dir> [I<push args..." -">]" +"B<dgit> [I<dgit-opts>] B<rpush>|B<rpush-built> I<build-host>B<:>I<build-dir> " +"[I<push args...>]" msgstr "" #. type: Plain text @@ -339,7 +339,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:148 ../dgit.1:200 ../dgit.1:240 +#: ../dgit.1:148 ../dgit.1:196 ../dgit.1:236 msgid "Tagging, signing and actually uploading should be left to dgit push." msgstr "" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1278 +#: ../dgit.1:185 ../dgit.1:1346 msgid "Print a usage summary." msgstr "" @@ -437,21 +437,14 @@ msgid "" "I<package>B<_>I<version>B<_multi.changes>." msgstr "" -#. type: Plain text -#: ../dgit.1:198 -msgid "" -"Note that by default sbuild does not build arch-independent packages. You " -"probably want to pass -A, to request those." -msgstr "" - #. type: TP -#: ../dgit.1:200 +#: ../dgit.1:196 #, no-wrap msgid "B<dgit pbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:208 +#: ../dgit.1:204 msgid "" "Constructs the source package, uses B<pbuilder> to do a binary build, and " "uses mergechanges to merge the source and binary changes files. The output " @@ -459,14 +452,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:211 +#: ../dgit.1:207 msgid "" "You should ensure that your dgit --build-products-dir setting matches your " "pbuilder --buildresult." msgstr "" #. type: Plain text -#: ../dgit.1:217 +#: ../dgit.1:213 msgid "" "The I<debbuildopts> are passed to pbuilder using its --debbuildopts option. " "If you want to pass other options to pbuilder, use the B<--pbuilder:> dgit " @@ -475,75 +468,75 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:223 +#: ../dgit.1:219 msgid "" "You should ensure that in your pbuilderrc you do B<not> have the setting " "B<SOURCE_ONLY_CHANGES=yes> as this may cause trouble." msgstr "" #. type: TP -#: ../dgit.1:223 +#: ../dgit.1:219 #, no-wrap msgid "B<dgit cowbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:229 +#: ../dgit.1:225 msgid "Like B<dgit pbuilder>, but uses B<cowbuilder> instead of B<pbuilder.>" msgstr "" #. type: TP -#: ../dgit.1:229 +#: ../dgit.1:225 #, no-wrap msgid "B<dgit gbp-build> ..." msgstr "" #. type: Plain text -#: ../dgit.1:235 +#: ../dgit.1:231 msgid "" "Runs B<git-buildpackage> with some suitable options. Options and arguments " "after gbp-build will be passed on to git-buildpackage." msgstr "" #. type: Plain text -#: ../dgit.1:238 +#: ../dgit.1:234 msgid "" "By default this uses --quilt=gbp, so HEAD should be a git-buildpackage style " "branch, not a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:240 +#: ../dgit.1:236 #, no-wrap -msgid "B<dgit push> [I<suite>]" +msgid "B<dgit push-source> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:249 +#: ../dgit.1:241 msgid "" -"Does an `upload', pushing the current HEAD to the archive (as a source " -"package) and to dgit-repos (as git commits). The package must already have " -"been built ready for upload, with the .dsc and .changes left in the parent " -"directory. It is normally best to do the build with dgit too (eg with dgit " -"sbuild): some existing build tools pass unhelpful options to dpkg-source et " -"al by default, which can result in the built source package not being " -"identical to the git tree." +"Does an `upload': sends the current HEAD to dgit-repos (as git commits), and " +"to the archive (as a source package, built by dgit push-source)." msgstr "" #. type: Plain text -#: ../dgit.1:259 +#: ../dgit.1:243 +msgid "This is the usual way to upload to Debian." +msgstr "" + +#. type: Plain text +#: ../dgit.1:254 msgid "" -"In more detail: dgit push checks that the current HEAD corresponds to the ." -"dsc. It then pushes the HEAD to the suite's dgit-repos branch, adjusts the ." -"changes to include any .origs which the archive lacks and exclude .origs " -"which the archive has (so -sa and -sd are not needed when building for dgit " -"push), makes a signed git tag, edits the .dsc to contain the dgit metadata " -"field, runs debsign to sign the upload (.dsc and .changes), pushes the " -"signed tag, and finally uses dput to upload the .changes to the archive." +"In more detail: dgit push-source builds a source package from HEAD. It then " +"pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to " +"include any .origs which the archive lacks and exclude .origs which the " +"archive has (so -sa and -sd are not needed when building for dgit push), " +"makes a signed git tag, edits the .dsc to contain the dgit metadata field, " +"runs debsign to sign the upload (.dsc and .changes), pushes the signed tag, " +"and finally uses dput to upload the .changes to the archive." msgstr "" #. type: Plain text -#: ../dgit.1:263 +#: ../dgit.1:258 msgid "" "dgit push always uses the package, suite and version specified in the debian/" "changelog and the .dsc, which must agree. If the command line specifies a " @@ -551,111 +544,129 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:268 +#: ../dgit.1:263 msgid "" "When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " "branch for source package upload and push." msgstr "" +#. type: Plain text +#: ../dgit.1:267 +msgid "" +"With B<-C>, dgit push-source performs a dgit push-built, additionally " +"ensuring that no binary packages are uploaded." +msgstr "" + #. type: TP -#: ../dgit.1:268 +#: ../dgit.1:267 #, no-wrap -msgid "B<dgit push-source> [I<suite>]" +msgid "B<dgit push-built> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:273 +#: ../dgit.1:274 msgid "" -"Without B<-C>, builds a source package and dgit pushes it. Saying B<dgit " -"push-source> is like saying \"update the source code in the archive to match " -"my git HEAD, and let the autobuilders do the rest.\"" +"Does an `upload' of a previously built package, possibly including " +"binaries. Sends the current HEAD to dgit-repos (as git commits); and, sends " +"the previously built source package and binaries to the archive." msgstr "" #. type: Plain text -#: ../dgit.1:276 +#: ../dgit.1:281 msgid "" -"With B<-C>, performs a dgit push, additionally ensuring that no binary " -"packages are uploaded." +"The package must already have been built ready for upload, with the .dsc " +"and .changes left in the parent directory. It is normally best to do the " +"build with dgit too (eg with dgit sbuild): some existing build tools pass " +"unhelpful options to dpkg-source et al by default, which can result in the " +"built source package not being identical to the git tree." +msgstr "" + +#. type: Plain text +#: ../dgit.1:286 +msgid "" +"dgit will check that the .dsc corresponds exactly to the current HEAD, " +"ensuring that all users whether of the dgit git view, or of the traditional " +"archive, see the same source package." msgstr "" #. type: TP -#: ../dgit.1:276 +#: ../dgit.1:286 #, no-wrap -msgid "B<dgit rpush> I<build-host>B<:>I<build-dir> [I<push args...>]" +msgid "B<dgit rpush-source>|B<rpush-built> I<build-host>B<:>I<src-dir> [I<push args...>]" msgstr "" #. type: Plain text -#: ../dgit.1:283 +#: ../dgit.1:293 msgid "" "Pushes the contents of the specified directory on a remote machine. This is " -"like running dgit push on build-host with build-dir as the current " -"directory; however, signing operations are done on the invoking host. This " -"allows you to do a push when the system which has the source code and the " -"build outputs has no access to the key:" +"like running dgit push on build-host with src-dir as the current directory; " +"however, signing operations are done on the invoking host. This allows you " +"to do a push when the system which has the source code (and any built " +"binaries) has no access to the key:" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "1." msgstr "" #. type: tbl table -#: ../dgit.1:286 +#: ../dgit.1:296 #, no-wrap msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 #, no-wrap msgid "2." msgstr "" #. type: tbl table -#: ../dgit.1:287 +#: ../dgit.1:297 #, no-wrap msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 #, no-wrap msgid "3." msgstr "" #. type: tbl table -#: ../dgit.1:288 +#: ../dgit.1:298 #, no-wrap msgid "Build package on build host (dgit build)" msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:299 #, no-wrap msgid "4." msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:299 #, no-wrap msgid "Test package on build host or elsewhere (dpkg -i, test)" msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:300 #, no-wrap msgid "5." msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:300 #, no-wrap msgid "Upload by invoking dgit rpush on host with your GPG key." msgstr "" #. type: Plain text -#: ../dgit.1:296 +#: ../dgit.1:306 msgid "" "However, the build-host must be able to ssh to the dgit repos. If this is " "not already the case, you must organise it separately, for example by the " @@ -663,13 +674,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:299 +#: ../dgit.1:310 msgid "" -"The remaining arguments are treated just as dgit push would handle them." +"The remaining arguments are treated just as dgit push-source or dgit push-" +"built would handle them." msgstr "" #. type: Plain text -#: ../dgit.1:304 +#: ../dgit.1:315 msgid "" "build-host and build-dir can be passed as separate arguments; this is " "assumed to be the case if the first argument contains no : (except perhaps " @@ -677,7 +689,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:308 +#: ../dgit.1:319 msgid "" "You will need similar enough versions of dgit on the build-host and the " "invocation host. The build-host needs gnupg installed, with your public key " @@ -685,13 +697,112 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:308 +#: ../dgit.1:319 +#, no-wrap +msgid "B<dgit push>|B<rpush> I<...>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:330 +msgid "" +"Configurable aliases for B<dgit push-built> and B<dgit rpush-built>, which " +"will in the future change to mean B<dgit push-source> and B<dgit rpush-" +"source>, and therefore currently generate a warning." +msgstr "" + +#. type: Plain text +#: ../dgit.1:334 +msgid "" +"The behaviour of dgit push is controlled by the B<dgit.default.push-subcmd> " +"git config option:" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "B<source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "runs B<dgit push-source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "future default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:337 +#, no-wrap +msgid "B<built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:337 +#, no-wrap +msgid "and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "B<built,warn>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "warns, and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "current default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "B<reject>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "fails" +msgstr "" + +#. type: Plain text +#: ../dgit.1:350 +msgid "" +"For dgit rpush, the behaviour is controlled by B<dgit.default.rpush-subcmd>, " +"falling back to B<dgit.default.push-subcmd> if that is not set. Because " +"dgit rpush is not typically run in a git working tree, only global git " +"config options (and B<-c> command line options) are relevant." +msgstr "" + +#. type: Plain text +#: ../dgit.1:360 +msgid "" +"These settings can safely be passed to older dgit (via B<-c);> the value " +"B<built> will be supported indefinitely. This should be used in scripts " +"that need to work with both old versions of dgit (that don't have B<push-" +"built>) and new versions (where B<push-source> is the default)." +msgstr "" + +#. type: TP +#: ../dgit.1:360 #, no-wrap msgid "B<dgit setup-new-tree>" msgstr "" #. type: Plain text -#: ../dgit.1:324 +#: ../dgit.1:376 msgid "" "Configure the current working tree the way that dgit clone would have set it " "up. Like running B<dgit setup-useremail>, B<setup-mergechangelogs> and " @@ -702,13 +813,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:324 +#: ../dgit.1:376 #, no-wrap msgid "B<dgit setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:330 +#: ../dgit.1:382 msgid "" "Set the working tree's user.name and user.email from the distro-specific " "dgit configuration (B<dgit-distro.>I<distro>B<.user-name> and B<.user-" @@ -716,26 +827,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:330 +#: ../dgit.1:382 #, no-wrap msgid "B<dgit setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:336 +#: ../dgit.1:388 msgid "" "Configures a git merge helper for the file B<debian/changelog> which uses " "B<dpkg-mergechangelogs>." msgstr "" #. type: TP -#: ../dgit.1:336 +#: ../dgit.1:388 #, no-wrap msgid "B<dgit setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:351 +#: ../dgit.1:403 msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " @@ -745,7 +856,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:359 +#: ../dgit.1:411 msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " @@ -754,7 +865,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:370 +#: ../dgit.1:422 msgid "" "(If there is already a macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes which does what dgit requires (whatever files it " @@ -764,13 +875,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:370 +#: ../dgit.1:422 #, no-wrap msgid "B<dgit quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:377 +#: ../dgit.1:429 msgid "" "`3.0 (quilt)' format source packages need changes representing not only in-" "tree but also as patches in debian/patches. dgit quilt-fixup checks whether " @@ -779,12 +890,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:379 +#: ../dgit.1:431 msgid "This is normally done automatically by dgit build and dgit push." msgstr "" #. type: Plain text -#: ../dgit.1:385 +#: ../dgit.1:437 msgid "" "dgit will try to turn each relevant commit in your git history into a new " "quilt patch. dgit cannot convert nontrivial merges, or certain other kinds " @@ -794,7 +905,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:394 +#: ../dgit.1:446 msgid "" "When used with a git-debrebase branch, dgit will ask git-debrebase to " "prepare patches. However, dgit can make patches in some situations where " @@ -804,25 +915,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:399 +#: ../dgit.1:451 msgid "See B<FORMAT 3.0 (QUILT)> in B<dgit(7)>." msgstr "" #. type: TP -#: ../dgit.1:399 +#: ../dgit.1:451 #, no-wrap msgid "B<dgit import-dsc> [I<sub-options>] I<../path/to/.dsc> [B<+>|B<..>]branch" msgstr "" #. type: Plain text -#: ../dgit.1:405 +#: ../dgit.1:457 msgid "" "Import a Debian-format source package, specified by its .dsc, into git, the " "way dgit fetch would do." msgstr "" #. type: Plain text -#: ../dgit.1:416 +#: ../dgit.1:468 msgid "" "This does about half the work of dgit fetch: it will convert the .dsc into a " "new, orphan git branch. Since dgit has no access to a corresponding source " @@ -833,7 +944,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:426 +#: ../dgit.1:478 msgid "" "Because a .dsc can contain a Dgit field naming a git commit (which you might " "not have), and specifying where to find that commit (and any history rewrite " @@ -843,12 +954,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:428 +#: ../dgit.1:480 msgid "There is only one sub-option:" msgstr "" #. type: Plain text -#: ../dgit.1:434 +#: ../dgit.1:486 msgid "" "B<--require-valid-signature> causes dgit to insist that the signature on " "the .dsc is valid (using the same criteria as dpkg-source -x). Otherwise, " @@ -857,7 +968,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:453 +#: ../dgit.1:505 msgid "" "If I<branch> is prefixed with B<+> then if it already exists, it will be " "simply overwritten, no matter its existing contents. If I<branch> is " @@ -869,55 +980,55 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:457 +#: ../dgit.1:509 msgid "If I<branch> does not start with refs/, refs/heads/ is prepended." msgstr "" #. type: TP -#: ../dgit.1:457 +#: ../dgit.1:509 #, no-wrap msgid "B<dgit version>" msgstr "" #. type: Plain text -#: ../dgit.1:460 +#: ../dgit.1:512 msgid "Prints version information and exits." msgstr "" #. type: TP -#: ../dgit.1:460 +#: ../dgit.1:512 #, no-wrap msgid "B<dgit clone-dgit-repos-server>I< destdir>" msgstr "" #. type: Plain text -#: ../dgit.1:464 +#: ../dgit.1:516 msgid "" "Tries to fetch a copy of the source code for the dgit-repos-server, as " "actually being used on the dgit git server, as a git tree." msgstr "" #. type: TP -#: ../dgit.1:464 +#: ../dgit.1:516 #, no-wrap msgid "B<dgit print-dgit-repos-server-source-url>" msgstr "" #. type: Plain text -#: ../dgit.1:469 +#: ../dgit.1:521 msgid "" "Prints the url used by dgit clone-dgit-repos-server. This is hopefully " "suitable for use as a git remote url. It may not be useable in a browser." msgstr "" #. type: TP -#: ../dgit.1:469 +#: ../dgit.1:521 #, no-wrap msgid "B<dgit print-dpkg-source-ignores>" msgstr "" #. type: Plain text -#: ../dgit.1:476 +#: ../dgit.1:528 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " "it to exclude exactly the .git directory and nothing else. The separate " @@ -925,13 +1036,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:476 +#: ../dgit.1:528 #, no-wrap msgid "B<dgit print-unapplied-treeish>" msgstr "" #. type: Plain text -#: ../dgit.1:487 +#: ../dgit.1:539 msgid "" "Constructs a tree-ish approximating the patches-unapplied state of your 3.0 " "(quilt) package, and prints the git object name to stdout. This requires " @@ -942,7 +1053,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:494 +#: ../dgit.1:546 msgid "" "To make this operate off-line, the access configuration key which is used to " "determine the build-products-dir is the uncanonicalised version of the suite " @@ -951,51 +1062,24 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:496 +#: ../dgit.1:548 msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:548 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" #. type: TP -#: ../dgit.1:497 -#, no-wrap -msgid "B<--dry-run> | B<-n>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:503 -msgid "" -"Go through the motions, fetching all information needed, but do not actually " -"update the output(s). For push, dgit does the required checks and leaves " -"the new .dsc in a temporary file, but does not sign, tag, push or upload." -msgstr "" - -#. type: TP -#: ../dgit.1:503 -#, no-wrap -msgid "B<--damp-run> | B<-L>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:508 -msgid "" -"Go through many more of the motions: do everything that doesn't involve " -"either signing things, or making changes on the public servers." -msgstr "" - -#. type: TP -#: ../dgit.1:508 +#: ../dgit.1:549 #, no-wrap msgid "B<-k>I<keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:517 +#: ../dgit.1:558 msgid "" "Use I<keyid> for signing the tag and the upload. The default comes from the " "distro's B<keyid> config setting (see CONFIGURATION, below), or failing " @@ -1003,24 +1087,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:517 +#: ../dgit.1:558 #, no-wrap msgid "B<--no-sign>" msgstr "" #. type: Plain text -#: ../dgit.1:520 +#: ../dgit.1:561 msgid "does not sign tags or uploads (meaningful only with push)." msgstr "" #. type: TP -#: ../dgit.1:521 +#: ../dgit.1:562 #, no-wrap msgid "B<-p>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:527 +#: ../dgit.1:568 msgid "" "Specifies that we should process source package I<package> rather than " "looking in debian/control or debian/changelog. Valid with dgit fetch and " @@ -1028,27 +1112,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:527 +#: ../dgit.1:568 #, no-wrap msgid "B<--clean=git> | B<-wg>" msgstr "" #. type: Plain text -#: ../dgit.1:533 +#: ../dgit.1:574 msgid "" "Use B<git clean -xdf> to clean the working tree, rather than running the " "package's rules clean target." msgstr "" #. type: Plain text -#: ../dgit.1:536 +#: ../dgit.1:577 msgid "" "This will delete all files which are not tracked by git. (Including any " "files you forgot to git add.)" msgstr "" #. type: Plain text -#: ../dgit.1:541 +#: ../dgit.1:582 msgid "" "B<--clean=>I<...> options other than dpkg-source are useful when the " "package's clean target is troublesome, or to avoid needing the build-" @@ -1056,7 +1140,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:548 +#: ../dgit.1:589 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " "build the source package or binaries from your working tree). Otherwise it " @@ -1065,13 +1149,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:548 +#: ../dgit.1:589 #, no-wrap msgid "B<--clean=git-ff> | B<-wgf>" msgstr "" #. type: Plain text -#: ../dgit.1:557 +#: ../dgit.1:598 msgid "" "Use B<git clean -xdff> to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " @@ -1079,33 +1163,33 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:557 +#: ../dgit.1:598 #, no-wrap msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text -#: ../dgit.1:561 +#: ../dgit.1:602 msgid "" "Like --clean=git, but always does the clean and not just a check, deleting " "any untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:561 +#: ../dgit.1:602 #, no-wrap msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:567 +#: ../dgit.1:608 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:578 +#: ../dgit.1:619 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B<?> in git status (ie, ones you " @@ -1113,13 +1197,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:578 +#: ../dgit.1:619 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:586 +#: ../dgit.1:627 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1128,13 +1212,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:586 +#: ../dgit.1:627 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:591 +#: ../dgit.1:632 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1142,12 +1226,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:595 +#: ../dgit.1:636 msgid "Without the extra B<d>, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:605 +#: ../dgit.1:646 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1155,7 +1239,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:612 +#: ../dgit.1:653 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1164,7 +1248,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:622 +#: ../dgit.1:663 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1175,52 +1259,60 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:622 +#: ../dgit.1:663 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:626 +#: ../dgit.1:667 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:626 +#: ../dgit.1:667 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:631 +#: ../dgit.1:672 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:631 +#: ../dgit.1:672 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:638 +#: ../dgit.1:678 +msgid "" +"The package is, or may be, new in this suite. Without this, dgit will " +"refuse to push. Needing --new is not unusual; for example, it is frequently " +"needed for uploading to Debian experimental." +msgstr "" + +#. type: Plain text +#: ../dgit.1:684 msgid "" -"The package is or may be new in this suite. Without this, dgit will refuse " -"to push. It may (for Debian, will) be unable to access the git history for " -"any packages which have been newly pushed and have not yet been published." +"Note that dgit may be unable to access the git history for an entirely new " +"package which has not been accepted by the archive. So for an entirely new " +"package you need to properly coordinate with anyone else who might upload." msgstr "" #. type: TP -#: ../dgit.1:638 +#: ../dgit.1:684 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:646 +#: ../dgit.1:692 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1230,7 +1322,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:658 +#: ../dgit.1:704 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 " @@ -1241,24 +1333,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:658 +#: ../dgit.1:704 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:661 +#: ../dgit.1:707 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:661 +#: ../dgit.1:707 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:672 +#: ../dgit.1:718 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-" @@ -1267,14 +1359,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:679 +#: ../dgit.1:725 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:685 +#: ../dgit.1:731 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 " @@ -1283,14 +1375,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:691 +#: ../dgit.1:737 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:705 +#: ../dgit.1:751 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 " @@ -1301,7 +1393,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:711 +#: ../dgit.1:757 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 " @@ -1310,7 +1402,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:716 +#: ../dgit.1:762 msgid "" "(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 " @@ -1318,18 +1410,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:716 +#: ../dgit.1:762 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:765 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:729 +#: ../dgit.1:775 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 " @@ -1339,27 +1431,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:734 +#: ../dgit.1:780 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:734 +#: ../dgit.1:780 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:740 +#: ../dgit.1:786 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:750 +#: ../dgit.1:796 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 " @@ -1368,7 +1460,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:758 +#: ../dgit.1:804 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 " @@ -1377,13 +1469,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:758 +#: ../dgit.1:804 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:768 +#: ../dgit.1:814 msgid "" "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 " @@ -1392,7 +1484,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:772 +#: ../dgit.1:818 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1400,25 +1492,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:776 +#: ../dgit.1:822 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:780 +#: ../dgit.1:826 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:780 +#: ../dgit.1:826 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:840 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1430,13 +1522,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:794 +#: ../dgit.1:840 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:800 +#: ../dgit.1:846 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1444,7 +1536,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:806 +#: ../dgit.1:852 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1453,7 +1545,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:817 +#: ../dgit.1:863 msgid "" "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 " @@ -1463,13 +1555,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:817 +#: ../dgit.1:863 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:826 +#: ../dgit.1:872 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1481,13 +1573,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:826 +#: ../dgit.1:872 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:877 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1495,58 +1587,57 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:831 ../git-debpush.1.pod:114 +#: ../dgit.1:877 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:838 +#: ../dgit.1:884 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 " -"cannot be generated, fail. This is the default for Debian." +"With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " +"each relevant commit. If such a stack cannot be generated, fail. This is " +"the default for Debian." msgstr "" #. type: Plain text -#: ../dgit.1:843 +#: ../dgit.1:889 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: =item -#: ../dgit.1:843 ../git-debpush.1.pod:126 +#. type: TP +#: ../dgit.1:889 #, no-wrap -msgid "B<--quilt=auto>" +msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../dgit.1:899 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " -"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." +"With format `3.0 (quilt)', prefer a 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: =item -#: ../dgit.1:852 ../git-debpush.1.pod:120 +#: ../dgit.1:899 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:857 +#: ../dgit.1:905 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 " -"for an NMU in Debian." +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone) and generate a single additional patch for all the changes made in " +"git. This is not a good idea for an NMU in Debian." msgstr "" #. type: Plain text -#: ../dgit.1:863 +#: ../dgit.1:911 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 " @@ -1554,57 +1645,84 @@ msgid "" "remain true.)" msgstr "" +#. type: TP +#: ../dgit.1:911 +#, no-wrap +msgid "B<--quilt=single>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:918 +msgid "" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), delete all the existing patches, and then generate a single patch " +"for all the changes made in git. This is not a good idea for an NMU in " +"Debian." +msgstr "" + +#. type: Plain text +#: ../dgit.1:927 +msgid "" +"Use this instead of the B<single-debian-patch> dpkg-source format option. " +"That dpkg-source option cannot handle certain changes to the tree that dpkg-" +"source otherwise permits, and in some cases it can generate strange source " +"packages that dpkg-source appears to accept but which become corrupted when " +"people later try to modify them." +msgstr "" + #. type: =item -#: ../dgit.1:863 ../git-debpush.1.pod:131 +#: ../dgit.1:927 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:871 +#: ../dgit.1:937 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 " -"before pushing. (NB that dpkg-source --commit will not work because the " -"dgit git tree does not have a B<.pc> directory.)" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), and check that the patch metadata is up to date. If it isn't, fail; " +"you must then fix the metadata yourself somehow before pushing. (NB that " +"dpkg-source --commit will not work because the dgit git tree does not have a " +"B<.pc> directory.)" msgstr "" #. type: TP -#: ../dgit.1:871 +#: ../dgit.1:937 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:876 +#: ../dgit.1:944 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 " +"With format `3.0 (quilt)', assume that the tree is patches-applied (as " +"obtained from dgit clone), and I<assume> that the patch metadata is up to " +"date. If you use this option and the patch metadata is out of date, dgit " "push will fail." msgstr "" #. type: TP -#: ../dgit.1:876 +#: ../dgit.1:944 #, no-wrap 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:883 +#: ../dgit.1:951 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:887 +#: ../dgit.1:955 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:895 +#: ../dgit.1:963 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 " @@ -1613,7 +1731,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:903 +#: ../dgit.1:971 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 " @@ -1621,7 +1739,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:976 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 " @@ -1629,7 +1747,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:990 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1641,7 +1759,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:933 +#: ../dgit.1:1001 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, " @@ -1652,7 +1770,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:951 +#: ../dgit.1:1019 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1666,7 +1784,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:1028 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 " @@ -1678,13 +1796,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:960 +#: ../dgit.1:1028 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1037 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-" @@ -1694,7 +1812,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:975 +#: ../dgit.1:1043 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 " @@ -1703,7 +1821,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:980 +#: ../dgit.1:1048 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 " @@ -1711,20 +1829,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:980 +#: ../dgit.1:1048 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:985 +#: ../dgit.1:1053 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:993 +#: ../dgit.1:1061 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 " @@ -1734,7 +1852,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:999 +#: ../dgit.1:1067 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: " @@ -1742,18 +1860,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1002 +#: ../dgit.1:1070 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1005 +#: ../dgit.1:1073 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1013 +#: ../dgit.1:1081 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/" @@ -1761,20 +1879,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1084 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1016 +#: ../dgit.1:1084 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1021 +#: ../dgit.1:1089 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 " @@ -1782,7 +1900,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1030 +#: ../dgit.1:1098 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 " @@ -1790,13 +1908,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1030 +#: ../dgit.1:1098 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1038 +#: ../dgit.1:1106 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1805,13 +1923,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1038 +#: ../dgit.1:1106 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1050 +#: ../dgit.1:1118 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1823,32 +1941,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1121 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1053 +#: ../dgit.1:1121 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1057 +#: ../dgit.1:1125 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1128 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1069 +#: ../dgit.1:1137 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-" @@ -1857,85 +1975,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1069 +#: ../dgit.1:1137 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1072 +#: ../dgit.1:1140 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1072 +#: ../dgit.1:1140 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1147 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1079 +#: ../dgit.1:1147 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1150 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1082 +#: ../dgit.1:1150 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1085 +#: ../dgit.1:1153 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1085 +#: ../dgit.1:1153 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1089 +#: ../dgit.1:1157 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1089 +#: ../dgit.1:1157 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1161 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:1093 +#: ../dgit.1:1161 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1102 +#: ../dgit.1:1170 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 " @@ -1945,7 +2063,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1108 +#: ../dgit.1:1176 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 " @@ -1953,30 +2071,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1108 +#: ../dgit.1:1176 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1111 +#: ../dgit.1:1179 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1111 +#: ../dgit.1:1179 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1183 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1122 +#: ../dgit.1:1190 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 " @@ -1984,18 +2102,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1124 +#: ../dgit.1:1192 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1124 +#: ../dgit.1:1192 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1146 +#: ../dgit.1:1214 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2005,7 +2123,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1222 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, " @@ -2014,7 +2132,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1159 +#: ../dgit.1:1227 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2022,7 +2140,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1163 +#: ../dgit.1:1231 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 " @@ -2030,39 +2148,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1165 +#: ../dgit.1:1233 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1173 +#: ../dgit.1:1241 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:1173 +#: ../dgit.1:1241 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1247 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:1184 +#: ../dgit.1:1252 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:1191 +#: ../dgit.1:1259 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 " @@ -2070,13 +2188,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1191 +#: ../dgit.1:1259 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1214 +#: ../dgit.1:1282 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2086,14 +2204,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1290 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:1229 +#: ../dgit.1:1297 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 " @@ -2102,7 +2220,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1308 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 " @@ -2112,7 +2230,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1248 +#: ../dgit.1:1316 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 " @@ -2120,7 +2238,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1265 +#: ../dgit.1:1333 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 " @@ -2132,13 +2250,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1265 +#: ../dgit.1:1333 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1275 +#: ../dgit.1:1343 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 " @@ -2149,19 +2267,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1275 +#: ../dgit.1:1343 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1346 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1287 +#: ../dgit.1:1355 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2171,13 +2289,55 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1287 +#: ../dgit.1:1355 +#, no-wrap +msgid "B<--dry-run> | B<-n>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1361 +msgid "" +"Go through the motions, fetching all information needed, but do not actually " +"update the output(s). For push, dgit does the required checks and leaves " +"the new .dsc in a temporary file, but does not sign, tag, push or upload." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1364 +msgid "" +"This is not a very good simulation. It can easily go wrong in ways that a " +"for-real push wouldn't." +msgstr "" + +#. type: TP +#: ../dgit.1:1364 +#, no-wrap +msgid "B<--damp-run> | B<-L>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1369 +msgid "" +"Go through many more of the motions: do everything that doesn't involve " +"either signing things, or making changes on the public servers." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1374 +msgid "" +"Using this will make unsigned tags, and possibly other local changes, that " +"will get in the way of a for-real push. So be prepared to burn the version " +"number you're using." +msgstr "" + +#. type: TP +#: ../dgit.1:1374 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1295 +#: ../dgit.1:1382 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 " @@ -2186,13 +2346,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1295 +#: ../dgit.1:1382 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1389 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 " @@ -2200,13 +2360,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1302 +#: ../dgit.1:1389 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1309 +#: ../dgit.1:1396 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2215,26 +2375,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1309 +#: ../dgit.1:1396 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1314 +#: ../dgit.1:1401 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1314 +#: ../dgit.1:1401 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1407 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 " @@ -2242,13 +2402,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1407 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1327 +#: ../dgit.1:1414 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 " @@ -2256,65 +2416,81 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1327 +#: ../dgit.1:1414 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1332 +#: ../dgit.1:1419 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:1332 +#: ../dgit.1:1419 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1423 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1336 +#: ../dgit.1:1423 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1340 +#: ../dgit.1:1427 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1340 +#: ../dgit.1:1427 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1346 +#: ../dgit.1:1433 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: TP -#: ../dgit.1:1346 +#: ../dgit.1:1433 +#, no-wrap +msgid "B<--force-push-tainted>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1443 +msgid "" +"Go ahead and try to push even tainted git objects hat the server says it is " +"going to reject, but without declaring any --deliberately. This option is " +"provided for testing or strange situations, and is not the way to override " +"the taint check: using it will probably just fail later, burning the version " +"number you are using. Use the appropriate --deliberately option instead." +msgstr "" + +#. type: TP +#: ../dgit.1:1443 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1352 +#: ../dgit.1:1449 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2322,13 +2498,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1352 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1449 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1455 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<-" @@ -2336,31 +2512,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1457 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1360 +#: ../dgit.1:1457 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1463 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:1366 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1463 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1468 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 " @@ -2368,73 +2544,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1471 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1474 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1381 +#: ../dgit.1:1478 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1478 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1384 +#: ../dgit.1:1481 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1384 +#: ../dgit.1:1481 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1486 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:1389 +#: ../dgit.1:1486 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1393 +#: ../dgit.1:1490 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1490 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1399 +#: ../dgit.1:1496 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 " @@ -2442,45 +2618,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1496 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1403 +#: ../dgit.1:1500 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1502 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1409 +#: ../dgit.1:1506 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:1409 +#: ../dgit.1:1506 #, 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:1416 +#: ../dgit.1:1513 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, " @@ -2489,52 +2665,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1513 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1420 +#: ../dgit.1:1517 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1420 +#: ../dgit.1:1517 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1519 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1425 +#: ../dgit.1:1522 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1425 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1522 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1525 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1525 #, 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:1433 +#: ../dgit.1:1530 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, " @@ -2542,26 +2718,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1433 +#: ../dgit.1:1530 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1534 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:1437 +#: ../dgit.1:1534 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1442 +#: ../dgit.1:1539 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2569,13 +2745,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1442 +#: ../dgit.1:1539 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1448 +#: ../dgit.1:1545 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2583,24 +2759,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1448 +#: ../dgit.1:1545 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1551 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1454 +#: ../dgit.1:1551 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1466 +#: ../dgit.1:1563 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 --" @@ -2610,13 +2786,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1466 +#: ../dgit.1:1563 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1471 +#: ../dgit.1:1568 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2625,204 +2801,215 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1568 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1474 +#: ../dgit.1:1571 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1474 +#: ../dgit.1:1571 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1477 +#: ../dgit.1:1574 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1574 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1483 +#: ../dgit.1:1580 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:1483 +#: ../dgit.1:1580 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1582 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1584 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1586 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1588 #, 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:1493 +#: ../dgit.1:1590 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1592 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.policy-query-supported-ssh>I< >B<false>I<|>B<unknown>I<|>B<true>" +msgstr "" + +#. type: TP +#: ../dgit.1:1594 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1596 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1598 #, 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< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1600 #, 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:1503 +#: ../dgit.1:1602 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1604 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1507 -#, no-wrap -msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" -msgstr "" - -#. type: TP -#: ../dgit.1:1509 +#: ../dgit.1:1606 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1511 +#: ../dgit.1:1608 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1513 +#: ../dgit.1:1610 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1515 +#: ../dgit.1:1612 #, 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:1517 +#: ../dgit.1:1614 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1519 +#: ../dgit.1:1616 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1521 +#: ../dgit.1:1618 #, 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:1523 +#: ../dgit.1:1620 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1525 +#: ../dgit.1:1622 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1624 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1529 +#: ../dgit.1:1626 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1531 +#: ../dgit.1:1628 +#, no-wrap +msgid "B<dgit.default.push-subcmd>I< >B<source>I<|>B<built>I<|>B<warn,built>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1632 +msgid "Controls the behaviour of B<dgit push>." +msgstr "" + +#. type: TP +#: ../dgit.1:1632 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1533 +#: ../dgit.1:1634 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1534 +#: ../dgit.1:1635 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1543 +#: ../dgit.1:1644 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2832,26 +3019,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1543 +#: ../dgit.1:1644 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1547 +#: ../dgit.1:1648 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1547 +#: ../dgit.1:1648 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1653 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2859,13 +3046,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1552 +#: ../dgit.1:1653 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1559 +#: ../dgit.1:1660 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 " @@ -2873,7 +3060,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1565 +#: ../dgit.1:1666 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 " @@ -2881,7 +3068,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1570 +#: ../dgit.1:1671 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 " @@ -2890,7 +3077,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1575 +#: ../dgit.1:1676 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-" @@ -2898,25 +3085,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../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:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1584 +#: ../dgit.1:1685 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:1585 +#: ../dgit.1:1686 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index f41a2b8..d701d10 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-07-21 01:37+0100\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\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" @@ -40,13 +40,13 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../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: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 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -145,7 +145,7 @@ msgstr "" #. type: Plain text #: ../dgit.7:55 msgid "" -"dgit push will also make signed tags called B<archive/debian/>I<version> " +"dgit push-* will also make signed tags called B<archive/debian/>I<version> " "(with version encoded a la DEP-14) and push them to dgit-repos. These are " "used at the server to authenticate pushes." msgstr "" @@ -154,7 +154,7 @@ msgstr "" #: ../dgit.7:65 msgid "" "Uploads made by dgit contain an additional field B<Dgit> in the source " -"package .dsc. (This is added by dgit push.) This specifies: a commit (an " +"package .dsc. (This is added by dgit push-*.) This specifies: a commit (an " "ancestor of the dgit/suite branch) whose tree is identical to the unpacked " "source upload; the distro to which the upload was made; a tag name which can " "be used to fetch the git commits; and a url to use as a hint for the dgit " @@ -194,7 +194,7 @@ msgstr "" #. type: Plain text #: ../dgit.7:94 msgid "" -"dgit push can operate on any commit which is a descendant of the suite " +"dgit push-* can operate on any commit which is a descendant of the suite " "tracking branch." msgstr "" @@ -206,7 +206,7 @@ msgid "" "tarball(s). The orig tarballs are downloaded (by dgit clone) into the " "parent directory, as with a traditional (non-gitish) dpkg-source workflow. " "You need to retain these tarballs in the parent directory for dgit build and " -"dgit push. (They are not needed for purely-git-based workflows.)" +"dgit push-*. (They are not needed for purely-git-based workflows.)" msgstr "" #. type: Plain text @@ -625,12 +625,12 @@ msgstr "" msgid "" "Your appropriate response depends on the cause and the context. If you have " "been freely merging your git branch and do not need need a pretty linear " -"patch queue, you can use B<--quilt=smash> (or use the B<1.0> or B<single-" -"debian-patch> source formats; see B<dpkg-source(1)>.) If you want a pretty " -"linear series, and this message is unexpected, it can mean that you have " -"unwittingly committed changes that are not representable by dpkg-source " -"(such as some mode changes). Or maybe you just forgot a necessary B<--" -"quilt=> option." +"patch queue, you can use B<--quilt=single> or B<--quilt=smash>. (Don't use " +"the B<single-debian-patch> dpkg source format option; it has strange " +"properties.) If you want a pretty linear series, and this message is " +"unexpected, it can mean that you have unwittingly committed changes that are " +"not representable by dpkg-source (such as some mode changes). Or maybe you " +"just forgot a necessary B<--quilt=> option." msgstr "" #. type: Plain text @@ -658,7 +658,7 @@ msgstr "" #. type: Plain text #: ../dgit.7:410 msgid "" -"When a splitting quilt mode is selected dgit build commands and dgit push " +"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 "" @@ -675,8 +675,8 @@ msgstr "" msgid "" "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 " +"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 "" @@ -722,26 +722,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:455 +#: ../dgit.7:456 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 " -"dgit push directly from one of these extra-clean git branches, it will fail." +"are in the git commit on which dgit push-* operates. So if you just try to " +"dgit push-* directly from one of these extra-clean git branches, it will " +"fail." msgstr "" #. type: Plain text -#: ../dgit.7:457 +#: ../dgit.7:458 msgid "As the maintainer you therefore have the following options:" msgstr "" #. type: TP -#: ../dgit.7:457 ../dgit.7:468 ../dgit.7:517 ../dgit.7:525 +#: ../dgit.7:458 ../dgit.7:469 ../dgit.7:518 ../dgit.7:526 #, no-wrap msgid "\\(bu" msgstr "" #. type: Plain text -#: ../dgit.7:468 +#: ../dgit.7:469 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 " @@ -752,7 +753,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:474 +#: ../dgit.7:475 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 " @@ -760,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:480 +#: ../dgit.7:481 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 " @@ -769,7 +770,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:485 +#: ../dgit.7:486 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 " @@ -778,13 +779,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:486 +#: ../dgit.7:487 #, no-wrap msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC." msgstr "" #. type: Plain text -#: ../dgit.7:490 +#: ../dgit.7:491 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 " @@ -792,7 +793,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:500 +#: ../dgit.7:501 msgid "" "Examples sometimes include crossbuild firmware binaries and documentation. " "To avoid problems when building updated source packages (in particular, to " @@ -802,7 +803,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:508 +#: ../dgit.7:509 msgid "" "dpkg-source does not (with any of the commonly used source formats) " "represent deletion of binaries (outside debian/) present in upstream. Thus " @@ -812,7 +813,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:514 +#: ../dgit.7:515 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 " @@ -820,14 +821,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:517 +#: ../dgit.7:518 msgid "" "For the non-maintainer, this can be observed in the following suboptimal " "occurrences:" msgstr "" #. type: Plain text -#: ../dgit.7:525 +#: ../dgit.7:526 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 " @@ -836,7 +837,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:532 +#: ../dgit.7:533 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 " @@ -844,7 +845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:542 +#: ../dgit.7:543 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. " @@ -855,13 +856,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:542 +#: ../dgit.7:543 #, no-wrap msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:550 +#: ../dgit.7:551 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 " @@ -870,7 +871,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:558 +#: ../dgit.7:559 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 " @@ -878,7 +879,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:562 +#: ../dgit.7:563 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 46aa9f4..74b61a8 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\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" @@ -28,18 +28,18 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:548 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../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:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -82,7 +82,7 @@ msgid "" " git debrebase -i # edit the patch queue\n" " git debrebase conclude && git push # push to eg salsa\n" " git debrebase conclude && dgit push-source # source-only upload\n" -" git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n" +" git debrebase new-upstream 1.2.3-1 [-i] # uses tag, eg \"v1.2.3\"\n" " dpkg-buildpackage -uc -b # get test debs, at any time\n" "\n" msgstr "" @@ -303,7 +303,9 @@ msgstr "" #. type: =item #: ../git-debrebase.1.pod:137 -msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]" +msgid "" +"git-debrebase new-upstream <new-version> [<upstream-details>...] [--|-i <git-" +"rebase options...>]" msgstr "" #. type: textblock @@ -924,46 +926,49 @@ msgstr "" #: ../git-debrebase.1.pod:532 msgid "" "It also disables some coherency checks which depend on metadata extracted " -"from its commit message, so it is a snag if <commit-ish> is the anchor for " -"the previous upstream version in git-debrebase new-upstream operations." +"from its commit message, so it is a snag (C<-fanchor-treated>) if <commit-" +"ish> is the anchor for the previous upstream version in git-debrebase new-" +"upstream operations. You have to check yourself that the new upstream is " +"fast forward from the old one, and has the right components (as if " +"applicable)." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:539 +#: ../git-debrebase.1.pod:542 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:541 +#: ../git-debrebase.1.pod:544 msgid "" "Run <program>, instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:545 +#: ../git-debrebase.1.pod:548 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:547 +#: ../git-debrebase.1.pod:550 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:549 +#: ../git-debrebase.1.pod:552 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:551 +#: ../git-debrebase.1.pod:554 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:554 +#: ../git-debrebase.1.pod:557 msgid "" "This option may generate lossage of various kinds, including misleading " "error messages, references to nonexistent documentation, and you being " @@ -971,24 +976,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:562 +#: ../git-debrebase.1.pod:565 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:564 +#: ../git-debrebase.1.pod:567 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:567 +#: ../git-debrebase.1.pod:570 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:569 +#: ../git-debrebase.1.pod:572 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -996,30 +1001,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:581 +#: ../git-debrebase.1.pod:584 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:586 +#: ../git-debrebase.1.pod:589 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:591 +#: ../git-debrebase.1.pod:594 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:596 +#: ../git-debrebase.1.pod:599 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:601 +#: ../git-debrebase.1.pod:604 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1027,7 +1032,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:606 +#: ../git-debrebase.1.pod:609 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -1036,31 +1041,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:612 +#: ../git-debrebase.1.pod:615 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:616 +#: ../git-debrebase.1.pod:619 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:618 +#: ../git-debrebase.1.pod:621 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:623 +#: ../git-debrebase.1.pod:626 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:625 +#: ../git-debrebase.1.pod:628 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1068,13 +1073,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:631 +#: ../git-debrebase.1.pod:634 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:636 +#: ../git-debrebase.1.pod:639 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" |