diff options
Diffstat (limited to 'po4a/dgit_7.pot')
| -rw-r--r-- | po4a/dgit_7.pot | 87 |
1 files changed, 44 insertions, 43 deletions
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 " |