diff options
Diffstat (limited to 'po4a')
| -rw-r--r-- | po4a/dgit-downstream-dsc_7.pot | 624 | ||||
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 1287 | ||||
| -rw-r--r-- | po4a/dgit-maint-gbp_7.pot | 295 | ||||
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 860 | ||||
| -rw-r--r-- | po4a/dgit-maint-native_7.pot | 221 | ||||
| -rw-r--r-- | po4a/dgit-nmu-simple_7.pot | 249 | ||||
| -rw-r--r-- | po4a/dgit-sponsorship_7.pot | 527 | ||||
| -rw-r--r-- | po4a/dgit-user_7.pot | 707 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 2645 | ||||
| -rw-r--r-- | po4a/dgit_7.pot | 874 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 1024 | ||||
| -rw-r--r-- | po4a/git-debrebase_5.pot | 1127 |
12 files changed, 10440 insertions, 0 deletions
diff --git a/po4a/dgit-downstream-dsc_7.pot b/po4a/dgit-downstream-dsc_7.pot new file mode 100644 index 0000000..3bf1687 --- /dev/null +++ b/po4a/dgit-downstream-dsc_7.pot @@ -0,0 +1,624 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: =head1 +#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150 +#, no-wrap +msgid "CONFIGURATION" +msgstr "" + +#. type: =item +#: ../dgit.1:1198 ../dgit-downstream-dsc.7.pod:286 +#, no-wrap +msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" +msgstr "" + +#. type: =item +#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.upload-host>" +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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:3 +msgid "dgit-downstream-dsc - setting up dgit push for a new distro" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:7 +msgid "" +"This document is aimed at downstreams of Debian. It explains how you can " +"publish your packages' source code both as traditional Debian source " +"packages, and as git branches, using B<dgit push>. Your users will be able " +"to get the source with B<dgit clone>, or with traditional tools such as " +"B<apt-get source>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:16 +msgid "" +"Note that often it is unnecessary to publish traditional source packages. " +"Debian-format source packages can be complex, idiosyncratic and difficult to " +"work with. You should avoid them if you can. If you do not need to publish " +"source packages, you can work as a Debian downstream purely using git " +"branches, (using dgit to get the source from Debian in git form). You can " +"build binaries directly from git, and push package source code as a git " +"branch to an ordinary git server. See L<dgit-user(7)>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:28 +msgid "" +"Not every option is covered here. L<dgit(1)> has a mostly-complete list of " +"config options, although not always with useful descriptions." +msgstr "" + +#. type: =head1 +#: ../dgit-downstream-dsc.7.pod:32 +msgid "NAMES" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:34 +msgid "You need to choose some names." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:38 +msgid "I<distro> name" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:40 +msgid "" +"dgit understands each thing it interacts with as a B<distro>. So in dgit " +"terms, you are setting up a distro." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:43 +msgid "" +"You need a name for yourself (ie for your distro). The name will appear in " +"the git tags made by your tools, and in configuration settings. It must be " +"globally unique across all people and institutions who use dgit." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:49 +msgid "" +"You could choose your organisation's domain name, or a part of it if you " +"think that is going to be very unique." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:52 +msgid "" +"The distro name may contain ascii alphanumerics and B<. + ->, although B<-> " +"may be confusing and is probably best avoided. Try to avoid uppercase " +"letters (and underscore): you will be typing this name a lot." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:57 +msgid "" +"For example, if you were the Free Software Foundation Europe (fsfe.org) you " +"might call your distro fsfe or fsfe.org. In the rest of this document we " +"will write I<distro> for your distro name." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:63 +msgid "I<suite> names" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:65 +msgid "" +"In dgit and Debian archive terminology, a B<suite> is a line of development, " +"and/or a Debian release. For example, at the time of writing, Debian has " +"suites like B<sid> aka B<unstable>, B<buster> aka B<testing>, and B<stretch> " +"aka B<stable>. There are also ancillary suites like B<stretch-security>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:72 +msgid "" +"If your releases align with Debian's releases, then your suites should " +"contain the Debian suite names. B<Do not> use just the Debian names. That " +"will cause confusion. Instead, prepend your organisation's name and a " +"hyphen. For example, FSFE might end up with suites like fsfe-stretch." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:79 +msgid "" +"Suite names end up in git ref and branch names, and on dgit command lines. " +"Suite names can contain alphanumerics and C<->. Other characters may work " +"but are not recommended." +msgstr "" + +#. type: =head1 +#: ../dgit-downstream-dsc.7.pod:86 +msgid "SERVICES" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:88 +msgid "You will need to run two parallel services:" +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:92 +msgid "git server" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:94 +msgid "This will hold the git branches accessed by dgit." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:96 +msgid "" +"Everyone who will use dgit push needs to be able to update B<refs/dgit/" +">I<suite> (note, not B<refs/heads/dgit/>I<suite>) on that server, and to " +"make tags I<distro>B</>I<version> and B<archive/>I<distro>B</>I<version>. " +"Normally this would be done over ssh." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:103 +msgid "" +"The server may host other branches and tags too. So this might be your " +"ordinary git server, or an instance of a git hosting system." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:107 +msgid "" +"Everyone who obtains one of your source packages, or who will run B<dgit " +"clone> and B<dgit fetch>, needs to have at least read access to the git " +"server. Ideally everything would be published via the git smart https " +"protocol." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:113 +msgid "" +"The git server name, and public git url structure, should be chosen so they " +"will not need to change in the future. Best is to give the git server a DNS " +"name of its own." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:117 +msgid "" +"Debian's dgit git server has special access control rules, implemented in " +"B<dgit-repos-server> and B<dgit-repos-policy-debian> in the package B<dgit-" +"infrastructure>. but in most installations this is not needed. If there is " +"no or little distinction between (i) developers who are entitled to upload " +"(push) and (ii) repository administrators, then a it is sufficient to " +"provide a git server with a unix account for each user who will pushing, " +"perhaps using ssh restricted commands." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:128 +msgid "Debian-format archive (repository)" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:130 +msgid "" +"This holds the source packages. You will probably use the same archive to " +"host your binaries, and point your B<apt> at it." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:134 +msgid "dgit uses the term B<archive> for this." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:136 +msgid "" +"There are a variety of tools for creating and managing a Debian-format " +"archive. In this document we will assume you are using B<reprepro>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:140 +msgid "" +"Setting up reprepro is not covered in this tutorial. Instead, we assume you " +"already have reprepro working." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:143 +msgid "" +"You should also write appropriate dput configuration, since dgit uses dput " +"to upload packages to the archive. This will involve choosing a dput host " +"name. That's probably your distro name, I<distro>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:152 +msgid "" +"When you have all of the above set up, you are ready to explain to dgit how " +"to access your systems." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:155 +msgid "" +"dgit is configured via git's configuration system, so this is done with git " +"configuration. See L<git-config(1)>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:159 +msgid "" +"Below, each heading is one or more git config keys. B<bold> is literal text " +"and I<italics> is things that vary. In the descriptions of the effects of " +"config settings, we refer to the config values C<like this>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:167 +msgid "B<dgit-distro.>I<distro>B<.git-url>, B<.git-url-suffix>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:169 +msgid "" +"Specify the publicly accessible git URLs for your dgit git server. The urls " +"generated are C<git-url>B</>I<package>C<git-url-suffix>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:173 +msgid "" +"The url should be stable, and publicly accessible, because its name is " +"published in .dsc files. (Note that if you make modified versions of " +"packages from Debian, the copyleft licences used for Free Software often " +"require you to permit your users, employees, and downstreams to further " +"distribute your modified source code.)" +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:181 +msgid "B<dgit-distro.>I<distro>B</push.git-host>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:183 +msgid "The domain name of your git server's ssh interface." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:185 +msgid "" +"B<dgit-distro.>I<distro>B</push.git-user-force> B<dgit-distro.>I<distro>B</" +"push.username>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:187 +msgid "" +"Some git hosting systems expect everyone to connect over ssh as the same " +"user, often B<git>. If this is the case, set C<git-user-force> to that user." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:191 +msgid "" +"If you have a normal git over ssh arrangement, where people ssh as " +"themselves, leave C<git-user-force> unset. If a user wishes to override the " +"username (for example, if their local username is not the same as on the " +"server) they can set C<username>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:198 +msgid "B<dgit-distro.>I<distro>B</push.git-url>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:200 +msgid "" +"Set this to the empty string. This will arrange that push accesses to the " +"ssh server will use C</push.git-host>, etc." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:204 +msgid "B<dgit-distro.>I<distro>B</push.git-proto> B<git+ssh://>" +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:206 +msgid "C<dgit-distro.>I<distro>B</push.git-path>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:208 +msgid "" +"The path to your repositories. dgit push will try to push to C<git-" +"proto>[C<git-user-force>|C<username>B<@>]C<git-path>B</>I<package>B<.git>" +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:212 +msgid "B<dgit-distro.>I<distro>B<.git-check>, B<.git-check-suffix>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:214 +msgid "" +"dgit clone needs to be able to tell whether there is yet a git repository " +"for a particular package." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:217 +msgid "" +"If you always have a git repository for every package in your archive, " +"perhaps because you never use dput/dupload, and always dgit push, Set C<git-" +"check> to B<true>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:221 +msgid "" +"Otherwise, set C<git-check> to a url prefix - ideally, https. dgit clone " +"will try to fetch C<git-check>B</>I<package>C<git-check-suffix> and expect " +"to get either some successful fetch (it doesn't matter what) or a file not " +"found error (http 404 status code). Other outcomes are fatal errors." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:228 +msgid "" +"If your git server runs cgit, then you can set C<git-check> to the same as " +"C<git-url>, and C<git-check-suffix> to B</info/refs>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:232 +msgid "B<dgit-distro.>I<distro>B</push.git-check>, B</push.git-create>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:234 +msgid "dgit push also needs to be able to check whether the repo exists." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:236 +msgid "" +"You can set both of these to B<ssh-cmd>, which will use an ssh shell command " +"to test repository existence. Or leave them unset, and dgit push will use " +"the readonly details. If repositories are created automatically on push, " +"somehow, you can set C<git-create> to B<true>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:244 +msgid "What I<host> value to pass to dput, to upload." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:246 +msgid "" +"This is a nickname, not the real host name. You need to provide everyone " +"who will push with an appropriate dput configuration. See L<dput.cf(5)>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:251 +msgid "A good nickname for your upload host is your distro name I<distro>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:253 +msgid "B<dgit-distro.>I<distro>B<.mirror>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:255 +msgid "" +"Set this to the url of your source package archive. This is the same string " +"as appears in the 2nd field of each B<sources.list> entry." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:259 +msgid "B<dgit-distro.>I<distro>B<.archive-query>, B<.archive-query-url>" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:261 +msgid "" +"If you have a smallish distro, set C<archive-query> to B<aptget:> (with a " +"colon)." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:264 +msgid "" +"If your distro is large (eg, if it contains a substantial fraction of " +"Debian) then this will not be very efficient: with this setting, dgit often " +"needs to download and update Sources files." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:270 +msgid "" +"For large distros, it is better to implement the Debian archive ftpmaster " +"API. See L<https://api.ftp-master.debian.org/>, and set C<archive-query> to " +"B<ftpmasterapi:> (with a colon) and C<archive-query-url> to your API base " +"URL. dgit uses these queries: B<suites>, B<dsc_in_suite/>I<isuite>B</" +">I<package> and B<file_in_archive/>I<pat> (so you need not implement " +"anything else)." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:281 +msgid "" +"Alternatively, if your system supports the rmadison protocol, you can set " +"C<archive-query> to B<madison:>[I<madison-distro>]. dgit will invoke " +"B<rmadison> -uI<madison-distro>." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:288 +msgid "" +"Set this for every one of your suites. You will have to update this when " +"new suites are created. If you forget, your users can explicitly specify B<-" +"d> I<distro> to dgit." +msgstr "" + +#. type: =head1 +#: ../dgit-downstream-dsc.7.pod:295 +msgid "TEMPLATE GIT REPOSITORY" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:297 +msgid "" +"When dgit push is used for I<package> for the first time, it must create a " +"git repository on the git server." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:300 +msgid "" +"If C<git-create> is set to B<ssh-cmd>, dgit will use the user's shell access " +"to the server to B<cp -a _template.git> I<package>B<.git>. So you should " +"create B<_template.git> with suitable contents." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:305 +msgid "" +"Note that the ssh rune invoked by dgit does not do any locking. So if two " +"people dgit push the same package at the same time, there will be lossage. " +"Either don't do that, or set up B<dgit-repos-server>." +msgstr "" + +#. type: =head1 +#: ../dgit-downstream-dsc.7.pod:310 +msgid "SSH COMMANDS" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:312 +msgid "" +"When a user who can push runs dgit, dgit uses ssh to access the git server." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:315 +msgid "" +"To make ssh restricted command easier, and for the benefit of dgit-repos-" +"server, dgit's ssh commands each start with a parseable commentish rune." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:320 +msgid "The ssh commands used by dgit are these:" +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:324 +msgid "B<: dgit> I<distro> B<git-check> I<package> B<;>..." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:326 +msgid "" +"Test whether I<package> has a git repo on the server already. Should print " +"B<0> or B<1> and a newline, and exit status zero in either case. The rest " +"of the command, after B<;>, is a shell implementation of this test. Used " +"when C<git-check> is set to B<ssh-cmd>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:333 +msgid "B<: dgit> I<distro> B<git-create> I<package> B<;>..." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:335 +msgid "" +"Create the git repository for I<package> on the server. See L</TEMPLATE GIT " +"REPOSITORY>, above. The rest of the command is an appropriate invocation of " +"cd and cp. Used when C<git-create> is set to B<ssh-cmd>." +msgstr "" + +#. type: =item +#: ../dgit-downstream-dsc.7.pod:340 +msgid "B<git-receive-pack>..., B<git-upload-pack>..." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:342 +msgid "" +"dgit invokes git to access the repository; git then runs these commands. " +"Note that dgit push will first do a git fetch over ssh, so you must provide " +"upload-pack as well as receive-pack." +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:349 +msgid "(There are also other ssh commands which are historical or obscure.)" +msgstr "" + +#. type: textblock +#: ../dgit-downstream-dsc.7.pod:354 +msgid "dgit(1)" +msgstr "" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot new file mode 100644 index 0000000..5161500 --- /dev/null +++ b/po4a/dgit-maint-debrebase_7.pot @@ -0,0 +1,1287 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16 +#: ../dgit-maint-debrebase.7.pod:38 +msgid "" +"Benefit from dgit's safety catches. In particular, ensure that your upload " +"always matches exactly your git HEAD." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:47 ../dgit-maint-debrebase.7.pod:61 +msgid "INITIAL DEBIANISATION" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:49 ../dgit-maint-debrebase.7.pod:63 +msgid "" +"This section explains how to start using this workflow with a new package. " +"It should be skipped when converting an existing package to this workflow." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 +#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:321 +msgid "When upstream tags releases in git" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:55 ../dgit-maint-debrebase.7.pod:69 +msgid "" +"Suppose that the latest stable upstream release is 1.2.2, and this has been " +"tagged '1.2.2' by upstream." +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:60 ../dgit-maint-debrebase.7.pod:74 +#, no-wrap +msgid "" +" % git clone -oupstream https://some.upstream/foo.git\n" +" % cd foo\n" +" % git verify-tag 1.2.2\n" +" % git reset --hard 1.2.2\n" +" % git branch --unset-upstream\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:76 ../dgit-maint-debrebase.7.pod:90 +#, no-wrap +msgid "" +" % git remote add -f origin salsa.debian.org:Debian/foo.git\n" +" % git push --follow-tags -u origin master\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:93 ../dgit-maint-debrebase.7.pod:102 +msgid "Finally, you need an orig tarball:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#, no-wrap +msgid "" +" % git deborig\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:101 ../dgit-maint-debrebase.7.pod:110 +msgid "See git-deborig(1) if this fails." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:103 ../dgit-maint-debrebase.7.pod:112 +msgid "" +"This tarball is ephemeral and easily regenerated, so we don't commit it " +"anywhere (e.g. with tools like pristine-tar(1))." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 +#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 +#: ../dgit-maint-debrebase.7.pod:329 +msgid "When upstream releases only tarballs" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#, no-wrap +msgid "" +" % mkdir foo\n" +" % cd foo\n" +" % git init\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +msgid "Now create I<debian/gbp.conf>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" [DEFAULT]\n" +" upstream-branch = upstream\n" +" debian-branch = master\n" +" upstream-tag = %(version)s\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#, no-wrap +msgid "" +" sign-tags = True\n" +" pristine-tar = False\n" +" pristine-tar-commit = False\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#, no-wrap +msgid "" +" [import-orig]\n" +" merge-mode = merge\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#, no-wrap +msgid "" +" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" +" % git checkout --orphan upstream\n" +" % git rm -rf .\n" +" % git commit --allow-empty -m \"initial, empty branch for upstream source\"\n" +" % git checkout -f master\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +msgid "Then we can import the upstream version:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#, no-wrap +msgid "" +" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +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 " +"somewhere. The usual choice is B<salsa.debian.org>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#, no-wrap +msgid "" +" % git remote add -f origin salsa.debian.org:Debian/foo.git\n" +" % git push --follow-tags -u origin master upstream\n" +"\n" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +msgid "CONVERTING AN EXISTING PACKAGE" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +msgid "" +"This section explains how to convert an existing Debian package to this " +"workflow. It should be skipped when debianising a new package." +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#, no-wrap +msgid "" +" % git remote add -f upstream https://some.upstream/foo.git\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +msgid "" +"To achieve this, you might need to delete I<debian/source/local-options>. " +"One way to have dgit check your progress is to run B<dgit build-source>." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +msgid "BUILDING AND UPLOADING" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +msgid "Obtaining the release" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#, no-wrap +msgid "" +" % git remote update\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +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 " +"pushed this to B<salsa.debian.org>. You will need to clone or fetch from " +"there, instead of relying on B<dgit clone>/B<dgit fetch> alone." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +msgid "Then, either" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#, no-wrap +msgid "" +" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +msgid "or if you have a working watch file" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#, no-wrap +msgid "" +" % gbp import-orig --no-merge --uscan\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +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 " +"tarball:" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +msgid "HANDLING DFSG-NON-FREE MATERIAL" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +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>. " +"See uscan(1). Alternatively, see the I<--filter> option detailed in gbp-" +"import-orig(1)." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:526 +msgid "INCORPORATING NMUS" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:726 +msgid "AUTHOR" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +msgid "" +"This tutorial was written and is maintained by Sean Whitton " +"<spwhitton@spwhitton.name>. It contains contributions from other dgit " +"contributors too - see the dgit copyright file." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +msgid "GIT CONFIGURATION" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:3 +msgid "" +"dgit - tutorial for package maintainers, using a workflow centered around " +"git-debrebase(1)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:7 +msgid "" +"This document describes elements of a workflow for maintaining a non-native " +"Debian package using B<dgit>. We maintain the Debian delta as a series of " +"git commits on our master branch. We use git-debrebase(1) to shuffle our " +"branch such that this series of git commits appears at the end of the " +"branch. All the public git history is fast-forwarding, i.e., we do not " +"rewrite and force-push." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:14 +msgid "Some advantages of this workflow:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:20 +msgid "" +"Manipulate the delta queue using the full power of git-rebase(1), instead of " +"relying on quilt(1), and without having to switch back and forth between " +"patches-applied and patches-unapplied branches when committing changes and " +"trying to build, as with gbp-pq(1)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:27 +msgid "" +"If you are using 3.0 (quilt), provide your delta queue as a properly " +"separated series of quilt patches in the source package that you upload to " +"the archive (unlike with dgit-maint-merge(7))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:33 +msgid "" +"Avoid the git tree being dirtied by the application or unapplication of " +"patches, as they are always applied." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:43 +msgid "" +"Provide your full git history in a standard format on B<dgit-repos>, where " +"it can benefit downstream dgit users, such as people using dgit to do an NMU " +"(see dgit-nmu-simple(7) and dgit-user(7))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:49 +msgid "" +"Minimise the amount you need to know about 3.0 (quilt) in order to maintain " +"Debian source packages which use that format." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:54 +msgid "" +"This workflow is appropriate for packages where the Debian delta contains " +"multiple pieces which interact, or which you don't expect to be able to " +"upstream soon. For packages with simple and/or short-lived Debian deltas, " +"use of git-debrebase(1) introduces unneeded complexity. For such packages, " +"consider the workflow described in dgit-maint-merge(7)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:82 +msgid "" +"The final command detaches your master branch from the upstream remote, so " +"that git doesn't try to push anything there, or merge unreleased upstream " +"commits. To maintain a copy of your packaging branch on B<salsa.debian.org> " +"in addition to B<dgit-repos>, you can do something like this:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:95 +msgid "" +"Now go ahead and Debianise your package. Make commits on the master branch, " +"adding things in the I<debian/> directory, or patching the upstream source. " +"For technical reasons, B<it is essential that your first commit introduces " +"the debian/ directory containing at least one file, and does nothing else.> " +"In other words, make a commit introducing I<debian/> before patching the " +"upstream source." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-debrebase.7.pod:115 +msgid "Comparing upstream's tarball releases" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:119 +msgid "" +"The above assumes that you know how to build the package from git and that " +"doing so is straightforward." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:122 +msgid "" +"If, as a user of the upstream source, you usually build from upstream " +"tarball releases, rather than upstream git tags, you will sometimes find " +"that the git tree doesn't contain everything that is in the tarball." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:127 +msgid "" +"Additional build steps may be needed. For example, you may need your " +"I<debian/rules> to run autotools." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:130 +msgid "" +"You can compare the upstream tarball release, and upstream git tag, within " +"git, by importing the tarball into git as described in the next section, " +"using a different value for 'upstream-tag', and then using git-diff(1) to " +"compare the imported tarball to the release tag." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:139 +msgid "" +"Because we want to work in git, we need a virtual upstream branch with " +"virtual release tags. gbp-import-orig(1) can manage this for us. To begin" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:200 +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 " +"is essential that your first commit introduces the debian/ directory " +"containing at least one file, and does nothing else.> In other words, make a " +"commit introducing I<debian/> before patching the upstream source." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:212 +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 " +"have it locally, you'll need to clone it, and obtain the corresponding orig." +"tar from the archive:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:219 +#, no-wrap +msgid "" +" % git clone salsa.debian.org:Debian/foo\n" +" % cd foo\n" +" % dgit setup-new-tree\n" +" % origtargz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:226 +msgid "" +"If you don't have any existing git history, or you have history only on the " +"special B<dgit-repos> server, we start with B<dgit clone>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:231 +#, no-wrap +msgid "" +" % dgit clone foo\n" +" % cd foo\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:236 +msgid "Then we make new upstream tags available:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:244 +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 " +"should use depends on some facts about your repository:" +msgstr "" + +#. type: =item +#: ../dgit-maint-debrebase.7.pod:250 +msgid "(A) There is no delta queue." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:252 +msgid "If there do not exist any Debian patches, use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#, no-wrap +msgid "" +" % git debrebase convert-from-gbp\n" +"\n" +msgstr "" + +#. type: =item +#: ../dgit-maint-debrebase.7.pod:260 +msgid "(B) There is a delta queue, and patches are unapplied." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:262 +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. " +"Use" +msgstr "" + +#. type: =item +#: ../dgit-maint-debrebase.7.pod:272 +msgid "(C) There is a delta queue, and patches are applied." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:274 +msgid "Use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:278 +#, no-wrap +msgid "" +" % git debrebase convert-from-dgit-view\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:284 +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-" +"buildpackage -S>, and then unpacked the resultant source package." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:295 +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 " +"should configure git such that B<git pull> does not try to merge:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:302 +#, no-wrap +msgid "" +" % git config --local pull.rebase true\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:306 +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:309 +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 " +"the B<branch.autoSetupRebase> and B<branch.E<lt>nameE<gt>.rebase> settings " +"in git-config(5)." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-debrebase.7.pod:314 +msgid "IMPORTING NEW UPSTREAM RELEASES" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:316 +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:352 +msgid "Importing the release" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:356 +#, no-wrap +msgid "" +" % git debrebase new-upstream 1.2.3\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:360 +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 " +"new upstream source." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:364 +msgid "" +"If all went well, you can now review the merge of the new upstream release:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:369 +#, no-wrap +msgid "" +" git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:373 +msgid "" +"Pass I<--stat> just to see the list of changed files, which is useful to " +"determine whether there are any new or deleted files to may need accounting " +"for in your copyright file." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-debrebase.7.pod:387 +msgid "EDITING THE DEBIAN PACKAGING" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:389 +msgid "Just make commits on master that change the contents of I<debian/>." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-debrebase.7.pod:391 +msgid "EDITING THE DELTA QUEUE" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:393 +msgid "Adding new patches" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:395 +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-" +"revert(1), git-am(1) and git-cherry-pick(1)." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:399 +msgid "Editing patches: starting a debrebase" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:401 +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:406 ../dgit-maint-debrebase.7.pod:689 +#, no-wrap +msgid "" +" % git debrebase -i\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:410 +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:413 +msgid "Editing patches: finishing a debrebase" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:415 +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." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:421 +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:426 +#, no-wrap +msgid "" +" % git debrebase conclude\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:430 +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 " +"the editing of the delta queue that you think will be needed for this " +"editing session in a single debrebase, so that there is a single debrebase " +"stitch." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:438 +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 " +"cowbuilder>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:442 +msgid "" +"Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> " +"if the package is new in the target suite." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:445 +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 " +"appears right at the tip of the branch you will push:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:451 +#, no-wrap +msgid "" +" % git debrebase\n" +" % dgit push-source\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:456 +msgid "Note that this will introduce a new pseudomerge." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:458 +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:463 +msgid "Illegal material" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:465 +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 " +"illegal) cannot be handled this way." +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:469 +#, no-wrap +msgid "" +"If you encounter possibly-legally-dangerous material in the upstream\n" +"source code you should seek advice. It is often best not to make a\n" +"fuss on a public mailing list (at least, not at first). Instead,\n" +"email your archive administrators. For Debian that is\n" +" To: dgit-owner@debian.org, ftpmaster@ftp-master.debian.org\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:475 +msgid "DFSG-non-free: When upstream tags releases in git" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:477 +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 " +"tags per \"Importing the release\", above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:481 +msgid "For the first upstream release that requires DFSG filtering:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:485 +#, no-wrap +msgid "" +" % git checkout -b upstream-dfsg 1.2.3\n" +" % git rm evil.bin\n" +" % git commit -m \"upstream version 1.2.3 DFSG-cleaned\"\n" +" % git tag -s 1.2.3+dfsg\n" +" % git checkout master\n" +" % # proceed with \"Importing the release\" on 1.2.3+dfsg tag\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:494 +msgid "And for subsequent releases (whether or not they require filtering):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:498 +#, no-wrap +msgid "" +" % git checkout upstream-dfsg\n" +" % git merge 1.2.4\n" +" % git rm further-evil.bin # if needed\n" +" % git commit -m \"upstream version 1.2.4 DFSG-cleaned\" # if needed\n" +" % git tag -s 1.2.4+dfsg\n" +" % git checkout master\n" +" % # proceed with \"Importing the release\" on 1.2.4+dfsg tag\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:508 +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 " +"somewhere. Assuming that you have already set up an origin remote per the " +"above," +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:515 +#, no-wrap +msgid "" +" % git push --follow-tags -u origin master upstream-dfsg\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:519 +msgid "DFSG-non-free: When upstream releases only tarballs" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:528 +msgid "In the simplest case," +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:532 +#, no-wrap +msgid "" +" % dgit fetch\n" +" % git merge --ff-only dgit/dgit/sid\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:537 +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 " +"two simplest." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:541 +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 " +"overwritten by git-debrebase(1)." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:545 +msgid "Rebasing your work onto the NMU" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:549 +#, no-wrap +msgid "" +" % git rebase dgit/dgit/sid\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:553 +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:556 +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 " +"from the delta queue." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:560 +msgid "Manually applying the debdiff" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:562 +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 " +"B<dgit push> will require I<--overwrite>." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-debrebase.7.pod:567 +msgid "HINTS AND TIPS" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:569 +msgid "Minimising pseudomerges" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:571 +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:574 +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." +"debian.org>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:578 +msgid "" +"It is possible, though much less convenient, to reduce the number of " +"pseudomerges yet further. We debrebase only (i) when importing a new " +"release, and (ii) right before uploading. Instead of editing the existing " +"delta queue, you append fixup commits (and reversions of commits) that alter " +"the upstream source to the required state. You can push and pull to and " +"from B<salsa.debian.org> during this. Just before uploading, you debrebase, " +"once, to tidy everything up." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:586 +msgid "The debian/patches directory" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:588 +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 " +"trouble, or be ignored and overwritten by git-debrebase(1)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:593 +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 " +"information in that directory. When preparing patches to forward upstream, " +"you should use git-format-patch(1) on git commits, rather than sending files " +"from I<debian/patches>." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:599 +msgid "Upstream branches" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:601 +msgid "In this workflow, we specify upstream tags rather than any branches." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:603 +msgid "" +"Except when (i) upstream releases only tarballs, (ii) we require DFSG " +"filtering, or (iii) you also happen to be involved in upstream development, " +"we do not maintain any local branch corresponding to upstream, except " +"temporary branches used to prepare patches for forwarding, and the like." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:609 +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 " +"Debian package on a properly identified upstream version, rather than some " +"arbitrary commit on some branch. Tags are more useful for this." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:615 +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:618 +msgid "The first ever dgit push" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:620 +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 " +"introducing a new origin commit into your git history. (This origin commit " +"would represent the most recent non-dgit upload of the package, but this " +"should already be represented in your git history.)" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:626 +msgid "Inspecting the history" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:628 +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 " +"for other tools like tig(1), git-log(1), magit, etc." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:632 +msgid "History of package in Debian, disregarding history from upstream:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:636 +#, no-wrap +msgid "" +" % gitk --first-parent\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:638 +msgid "In a laundered branch, the delta queue is at the top." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:642 +msgid "History of the packaging, excluding the delta queue:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:644 +#, no-wrap +msgid "" +" % gitk :/debian :!/debian/patches\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:646 +msgid "Just the delta queue (i.e. Debian's changes to upstream):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:648 +#, no-wrap +msgid "" +" % gitk --first-parent -- :/ :!/debian\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:650 +msgid "Full history including old versions of the delta queue:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:654 +#, no-wrap +msgid "" +" % gitk --date-order\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:656 +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. --" +"date-order makes gitk show the delta queues in the right order." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:663 +msgid "Complete diff since the last upload:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:667 +#, no-wrap +msgid "" +" % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:669 +msgid "This includes changes to upstream files." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:673 +msgid "Interdiff of delta queue since last upload, if you really want it:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:675 +#, no-wrap +msgid "" +" % git debrebase make-patches\n" +" % git diff dgit/dgit/sid..HEAD -- debian/patches\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:678 +msgid "And of course there is:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:680 +#, no-wrap +msgid "" +" % git debrebase status\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-debrebase.7.pod:682 +msgid "Alternative ways to start a debrebase" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:684 +msgid "" +"Above we started an interactive debrebase by invoking git-debrebase(1) like " +"this:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:693 +msgid "It is also possible to perform a non-interactive rebase, like this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:697 +#, no-wrap +msgid "" +" % git debrebase -- [git-rebase options...]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:702 +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 " +"git-rebase(1) directly. For example," +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:708 +#, no-wrap +msgid "" +" % git debrebase\n" +" % git rebase -i HEAD~5 # there are 4 Debian patches\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:713 +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 " +"without a base argument will often start the rebase too early, and should be " +"avoided. Run git-debrebase instead. See also \"ILLEGAL OPERATIONS\" in git-" +"debrebase(5)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:724 +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 new file mode 100644 index 0000000..d1daa27 --- /dev/null +++ b/po4a/dgit-maint-gbp_7.pot @@ -0,0 +1,295 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56 +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 +msgid "dgit(1), dgit(7)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16 +#: ../dgit-maint-debrebase.7.pod:38 +msgid "" +"Benefit from dgit's safety catches. In particular, ensure that your upload " +"always matches exactly your git HEAD." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:526 +msgid "INCORPORATING NMUS" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:726 +msgid "AUTHOR" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:3 +msgid "" +"dgit - tutorial for package maintainers already using git-buildpackage(1)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:7 +msgid "" +"This document explains how B<dgit> can be incorporated into a git-" +"buildpackage(1) package-maintenance workflow. This should be read jointly " +"with git-buildpackage(1)'s documentation. Some reasons why you might want " +"to incorporate B<dgit> into your existing workflow:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:21 +msgid "" +"Provide a better, more detailed git history to downstream dgit users, such " +"as people using dgit to do an NMU (see dgit-nmu-simple(7) and dgit-user(7))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:27 +msgid "" +"Note that we assume a patches-unapplied repository: the upstream source " +"committed to the git repository is unpatched. git-buildpackage(1) can work " +"with patched-applied repositories, but is normally used with patches-" +"unapplied." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +msgid "GIT CONFIGURATION" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:34 +msgid "" +"If you have configured an I<export-dir> in your gbp.conf, you should tell " +"dgit about it:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:39 +#, no-wrap +msgid "" +" % git config --global dgit.default.build-products-dir /home/spwhitton/build-area\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:43 +msgid "If you run" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:47 +#, no-wrap +msgid "" +" % git config dgit.default.quilt-mode gbp\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:51 +msgid "in your repository, you can omit I<--gbp> wherever it occurs below." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:53 +msgid "" +"Note that this does require that you always work from your gbp master " +"branch, never the dgit patches-applied branch." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:58 +msgid "You can perform test builds like this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:62 +#, no-wrap +msgid "" +" % dgit [--include-dirty] gbp-build [OPTIONS]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:66 +msgid "" +"where I<--include-dirty> is needed for testing uncommitted changes, and " +"I<OPTIONS> are any further options to be passed on to gbp-buildpackage(1)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:70 +msgid "" +"If you are doing a source-only upload, you do not need to prepare a " +"I<_source.changes>, as B<dgit push-source> will take of that on your behalf." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:74 +msgid "" +"If you need to include binaries with your upload, you will probably want to " +"use sbuild(1), pbuilder(1) or cowbuilder(1):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:79 +#, no-wrap +msgid "" +" % dgit --rm-old-changes --gbp sbuild\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:83 +msgid "replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:85 +msgid "" +"We use I<--rm-old-changes> to ensure that there is exactly one changes file " +"corresponding to this package, so we can be confident we're uploading what " +"we intend (though B<dgit push> will do some safety checks)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:90 +msgid "" +"Note that none of the commands in this section are required to upload with " +"dgit. You can invoke gbp-buildpackage(1), pbuilder(1), cowbuilder(1) and " +"sbuild(1) directly. However, the defaults for these tools may leave you " +"with something that dgit will refuse to upload because it doesn't match your " +"git HEAD." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:96 +msgid "As a general rule, leave all signing and tagging to dgit." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-gbp.7.pod:98 +msgid "UPLOADING" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:100 +msgid "" +"Don't use I<--git-tag>: B<dgit push> will do this for you. To do a source-" +"only upload:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:105 +#, no-wrap +msgid "" +" % dgit --gbp push-source\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:109 +msgid "or if you need to include binaries," +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#, no-wrap +msgid "" +" % dgit --gbp push\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:117 +msgid "" +"This will push your git history to the dgit-repos, but you probably want to " +"follow it up with a push to salsa." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:120 +msgid "" +"You will need to pass I<--overwrite> if the previous upload was not " +"performed with dgit." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:123 +msgid "" +"If this is first ever dgit push of the package, consider passing I<--" +"deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " +"introducing a new origin commit into the dgit view of your git history. " +"(This origin commit would represent the most recent non-dgit upload of the " +"package, but this should already be represented in your git history.)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:132 +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 " +"upload will require I<--overwrite>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:142 +msgid "" +"This tutorial was written and is maintained by Sean Whitton " +"<spwhitton@spwhitton.name>." +msgstr "" diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot new file mode 100644 index 0000000..1dbb682 --- /dev/null +++ b/po4a/dgit-maint-merge_7.pot @@ -0,0 +1,860 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: =item +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#, no-wrap +msgid "1." +msgstr "" + +#. type: =item +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#, no-wrap +msgid "2." +msgstr "" + +#. type: =item +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#, no-wrap +msgid "3." +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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +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 +msgid "dgit(1), dgit(7)" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#, no-wrap +msgid "" +" % dgit pull\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:3 +msgid "" +"dgit - tutorial for package maintainers, using a workflow centered around " +"git-merge(1)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:7 +msgid "" +"This document describes elements of a workflow for maintaining a non-native " +"Debian package using B<dgit>. The workflow makes the following opinionated " +"assumptions:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:15 +msgid "" +"Git histories should be the non-linear histories produced by git-merge(1), " +"preserving all information about divergent development that was later " +"brought together." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:21 +msgid "" +"Maintaining convenient and powerful git workflows takes priority over the " +"usefulness of the raw Debian source package. The Debian archive is thought " +"of as an output format." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:25 +msgid "" +"For example, we don't spend time curating a series of quilt patches. " +"However, in straightforward cases, the information such a series would " +"contain is readily available from B<dgit-repos>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:33 +msgid "" +"It is more important to have the Debian package's git history be a " +"descendent of upstream's git history than to use exactly the orig.tar that " +"upstream makes available for download." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:39 +msgid "" +"This workflow is less suitable for some packages. When the Debian delta " +"contains multiple pieces which interact, or which you aren't going to be " +"able to upstream soon, it might be preferable to maintain the delta as a " +"rebasing patch series. For such a workflow see for example dgit-maint-" +"debrebase(7) and dgit-maint-gbp(7)." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:47 ../dgit-maint-debrebase.7.pod:61 +msgid "INITIAL DEBIANISATION" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:49 ../dgit-maint-debrebase.7.pod:63 +msgid "" +"This section explains how to start using this workflow with a new package. " +"It should be skipped when converting an existing package to this workflow." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 +#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:321 +msgid "When upstream tags releases in git" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:55 ../dgit-maint-debrebase.7.pod:69 +msgid "" +"Suppose that the latest stable upstream release is 1.2.2, and this has been " +"tagged '1.2.2' by upstream." +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:60 ../dgit-maint-debrebase.7.pod:74 +#, no-wrap +msgid "" +" % git clone -oupstream https://some.upstream/foo.git\n" +" % cd foo\n" +" % git verify-tag 1.2.2\n" +" % git reset --hard 1.2.2\n" +" % git branch --unset-upstream\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:68 +msgid "" +"The final command detaches your master branch from the upstream remote, so " +"that git doesn't try to push anything there, or merge unreleased upstream " +"commits. If you want to maintain a copy of your packaging branch on B<salsa." +"debian.org> in addition to B<dgit-repos>, you can do something like this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:76 ../dgit-maint-debrebase.7.pod:90 +#, no-wrap +msgid "" +" % git remote add -f origin salsa.debian.org:Debian/foo.git\n" +" % git push --follow-tags -u origin master\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:81 +msgid "" +"Now go ahead and Debianise your package. Just make commits on the master " +"branch, adding things in the I<debian/> directory. If you need to patch the " +"upstream source, just make commits that change files outside of the I<debian/" +"> directory. It is best to separate commits that touch I<debian/> from " +"commits that touch upstream source, so that the latter can be cherry-picked " +"by upstream." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:88 +msgid "" +"Note that there is no need to maintain a separate 'upstream' branch, unless " +"you also happen to be involved in upstream development. We work with " +"upstream tags rather than any branches, except when forwarding patches (see " +"FORWARDING PATCHES UPSTREAM, below)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:93 ../dgit-maint-debrebase.7.pod:102 +msgid "Finally, you need an orig tarball:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#, no-wrap +msgid "" +" % git deborig\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:101 ../dgit-maint-debrebase.7.pod:110 +msgid "See git-deborig(1) if this fails." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:103 ../dgit-maint-debrebase.7.pod:112 +msgid "" +"This tarball is ephemeral and easily regenerated, so we don't commit it " +"anywhere (e.g. with tools like pristine-tar(1))." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:106 +msgid "Verifying upstream's tarball releases" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:110 +msgid "" +"It can be a good idea to compare upstream's released tarballs with the " +"release tags, at least for the first upload of the package. If they are " +"different, you might need to add some additional steps to your I<debian/" +"rules>, such as running autotools." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:115 +msgid "" +"A convenient way to perform this check is to import the tarball as described " +"in the following section, using a different value for 'upstream-tag', and " +"then use git-diff(1) to compare the imported tarball to the release tag. If " +"they are the same, you can use upstream's tarball instead of running git-" +"deborig(1)." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 +#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 +#: ../dgit-maint-debrebase.7.pod:329 +msgid "When upstream releases only tarballs" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:125 +msgid "" +"We need a virtual upstream branch with virtual release tags. gbp-import-" +"orig(1) can manage this for us. To begin" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#, no-wrap +msgid "" +" % mkdir foo\n" +" % cd foo\n" +" % git init\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +msgid "Now create I<debian/gbp.conf>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" [DEFAULT]\n" +" upstream-branch = upstream\n" +" debian-branch = master\n" +" upstream-tag = %(version)s\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#, no-wrap +msgid "" +" sign-tags = True\n" +" pristine-tar = False\n" +" pristine-tar-commit = False\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#, no-wrap +msgid "" +" [import-orig]\n" +" merge-mode = merge\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#, no-wrap +msgid "" +" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" +" % git checkout --orphan upstream\n" +" % git rm -rf .\n" +" % git commit --allow-empty -m \"initial, empty branch for upstream source\"\n" +" % git checkout -f master\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +msgid "Then we can import the upstream version:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#, no-wrap +msgid "" +" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +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 " +"somewhere. The usual choice is B<salsa.debian.org>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#, no-wrap +msgid "" +" % git remote add -f origin salsa.debian.org:Debian/foo.git\n" +" % git push --follow-tags -u origin master upstream\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:185 +msgid "" +"You are now ready to proceed as above, making commits to both the upstream " +"source and the I<debian/> directory." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +msgid "CONVERTING AN EXISTING PACKAGE" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +msgid "" +"This section explains how to convert an existing Debian package to this " +"workflow. It should be skipped when debianising a new package." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:193 +msgid "No existing git history" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:197 +#, no-wrap +msgid "" +" % dgit clone foo\n" +" % cd foo\n" +" % git remote add -f upstream https://some.upstream/foo.git\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:203 +msgid "Existing git history using another workflow" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:205 +msgid "" +"First, if you don't already have the git history locally, clone it, and " +"obtain the corresponding orig.tar from the archive:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:210 +#, no-wrap +msgid "" +" % git clone git.debian.org:collab-maint/foo\n" +" % cd foo\n" +" % origtargz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:216 +msgid "Now dump any existing patch queue:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:220 +#, no-wrap +msgid "" +" % git rm -rf debian/patches\n" +" % git commit -m \"drop existing quilt patch queue\"\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:225 +msgid "Then make new upstream tags available:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#, no-wrap +msgid "" +" % git remote add -f upstream https://some.upstream/foo.git\n" +"\n" +msgstr "" + +#. type: =for +#: ../dgit-maint-merge.7.pod:233 +msgid "dgit-test dpkg-source-ignores begin" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:235 +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'(?:^|/)\\." +"git(?:/|$)' -I.git -S> and then unpacked the resultant source package." +msgstr "" + +#. type: =for +#: ../dgit-maint-merge.7.pod:240 +msgid "dgit-test dpkg-source-ignores end" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +msgid "" +"To achieve this, you might need to delete I<debian/source/local-options>. " +"One way to have dgit check your progress is to run B<dgit build-source>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:246 +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-" +"forward> instead of I<--overwrite>. This avoids introducing a new origin " +"commit into your git history. (This origin commit would represent the most " +"recent non-dgit upload of the package, but this should already be " +"represented in your git history.)" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:253 +msgid "SOURCE PACKAGE CONFIGURATION" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:255 +msgid "debian/source/options" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:257 +msgid "" +"We set some source package options such that dgit can transparently handle " +"the \"dropping\" and \"refreshing\" of changes to the upstream source:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:263 +#, no-wrap +msgid "" +" single-debian-patch\n" +" auto-commit\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:268 +msgid "" +"You don't need to create this file if you are using the version 1.0 source " +"package format." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:271 +msgid "Sample text for debian/source/patch-header" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:273 +msgid "" +"It is a good idea to explain how a user can obtain a breakdown of the " +"changes to the upstream source:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:278 +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 " +"represented as a quilt series." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:282 +msgid "" +"A detailed breakdown of the changes is available from their canonical " +"representation - git commits in the packaging repository. For example, to " +"see the changes made by the Debian maintainer in the first upload of " +"upstream version 1.2.3, you could use:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:290 +#, no-wrap +msgid "" +" % git clone https://git.dgit.debian.org/foo\n" +" % cd foo\n" +" % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:296 +msgid "" +"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:299 +msgid "A single combined diff, containing all the changes, follows." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:303 +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:307 +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:312 ../dgit-maint-debrebase.7.pod:436 +msgid "BUILDING AND UPLOADING" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:314 +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 " +"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:320 +msgid "" +"As an alternative to B<dgit build> and friends, you can use a tool like " +"gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " +"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:327 +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), " +"you can just run dpkg-buildpackage(1) or debuild(1) instead." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:331 +msgid "NEW UPSTREAM RELEASES" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +msgid "Obtaining the release" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#, no-wrap +msgid "" +" % git remote update\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +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 " +"pushed this to B<salsa.debian.org>. You will need to clone or fetch from " +"there, instead of relying on B<dgit clone>/B<dgit fetch> alone." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +msgid "Then, either" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#, no-wrap +msgid "" +" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +msgid "or if you have a working watch file" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#, no-wrap +msgid "" +" % gbp import-orig --no-merge --uscan\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:366 +msgid "Reviewing & merging the release" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:368 +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 " +"copyright file:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:374 +#, no-wrap +msgid "" +" % git diff --stat master..1.2.3 -- . ':!debian'\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:378 +msgid "You can then review the full merge diff:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:382 +#, no-wrap +msgid "" +" % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:386 +msgid "Once you're satisfied with what will be merged, update your package:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:390 +#, no-wrap +msgid "" +" % git merge 1.2.3\n" +" % dch -v1.2.3-1 New upstream release.\n" +" % git add debian/changelog && git commit -m changelog\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +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 " +"tarball:" +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +msgid "HANDLING DFSG-NON-FREE MATERIAL" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:410 +msgid "We create a DFSG-clean tag to merge to master:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:414 +#, no-wrap +msgid "" +" % git checkout -b pre-dfsg 1.2.3\n" +" % git rm evil.bin\n" +" % git commit -m \"upstream version 1.2.3 DFSG-cleaned\"\n" +" % git tag -s 1.2.3+dfsg\n" +" % git checkout master\n" +" % git branch -D pre-dfsg\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:423 +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 " +"publicly accessible in the git history on B<dgit-repos>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:428 +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 " +"administrator dgit-owner@debian.org and the ftpmasters ftpmaster@ftp-master." +"debian.org)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +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>. " +"See uscan(1). Alternatively, see the I<--filter> option detailed in gbp-" +"import-orig(1)." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:440 +msgid "FORWARDING PATCHES UPSTREAM" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:442 +msgid "The basic steps are:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:448 +msgid "Create a new branch based off upstream's master branch." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:452 +msgid "" +"git-cherry-pick(1) commits from your master branch onto your new branch." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:457 +msgid "" +"Push the branch somewhere and ask upstream to merge it, or use git-format-" +"patch(1) or git-request-pull(1)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:462 +msgid "For example (and it is only an example):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:466 +#, no-wrap +msgid "" +" % # fork foo.git on GitHub\n" +" % git remote add -f fork git@github.com:spwhitton/foo.git\n" +" % git checkout -b fix-error upstream/master\n" +" % git config branch.fix-error.pushRemote fork\n" +" % git cherry-pick master^2\n" +" % git push\n" +" % # submit pull request on GitHub\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:476 +msgid "" +"Note that when you merge an upstream release containing your forwarded " +"patches, git and dgit will transparently handle \"dropping\" the patches " +"that have been forwarded, \"retaining\" the ones that haven't." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:526 +msgid "INCORPORATING NMUS" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:488 +msgid "" +"Alternatively, you can apply the NMU diff to your repository. The next push " +"will then require I<--overwrite>." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:726 +msgid "AUTHOR" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +msgid "" +"This tutorial was written and is maintained by Sean Whitton " +"<spwhitton@spwhitton.name>. It contains contributions from other dgit " +"contributors too - see the dgit copyright file." +msgstr "" diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot new file mode 100644 index 0000000..da22681 --- /dev/null +++ b/po4a/dgit-maint-native_7.pot @@ -0,0 +1,221 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +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 +msgid "dgit(1), dgit(7)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:3 +msgid "dgit - tutorial for package maintainers of Debian-native packages" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:7 +msgid "" +"This document describes elements of a workflow for using B<dgit> to maintain " +"a Debian package that uses one of the native source formats (\"1.0\" & \"3.0 " +"(native)\")." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:15 +msgid "We expect that your git history is fast-forwarding." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:19 +msgid "" +"You should be prepared to tolerate a small amount of ugliness in your git " +"history in the form of merges which stitch the dgit-generated archive view " +"into your maintainer history." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:25 +msgid "" +"This is to handle uploads that were not made with dgit, such as the uploads " +"you made before switching to this workflow, or NMUs." +msgstr "" + +#. type: =head2 +#: ../dgit-maint-native.7.pod:31 +msgid "Benefits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16 +#: ../dgit-maint-debrebase.7.pod:38 +msgid "" +"Benefit from dgit's safety catches. In particular, ensure that your upload " +"always matches exactly your git HEAD." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:42 +msgid "Provide a better, more detailed history to downstream dgit users." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:48 +msgid "Incorporate an NMU with one command." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-native.7.pod:52 +msgid "FIRST PUSH WITH DGIT" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:54 +msgid "You do not need to do anything special to your tree to push with dgit." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:57 +msgid "Simply prepare your git tree in the usual way, and then:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-native.7.pod:61 +#, no-wrap +msgid "" +" % dgit -wgf sbuild -A -c sid\n" +" % dgit -wgf --overwrite push\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:66 +msgid "(Do not make any tags yourself: dgit push will do that.)" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:68 +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 +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 " +"previous non-dgit uploads." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:77 +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 " +"the dgit git server, is fast forward from the dgit archive view." +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:85 +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>. " +"instead of C<--overwrite>. This avoids introducing a new origin commit into " +"your git history." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-native.7.pod:93 +msgid "SUBSEQUENT PUSHES" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-native.7.pod:97 +#, no-wrap +msgid "" +" % dgit -wgf push\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:101 ../dgit-maint-native.7.pod:111 +msgid "That's it." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-native.7.pod:103 +msgid "INCORPORATING AN NMU" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#, no-wrap +msgid "" +" % dgit pull\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:113 +msgid "Or, if you would prefer to review the changes, you can do this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-native.7.pod:118 +#, no-wrap +msgid "" +" % dgit fetch\n" +" % dgit diff HEAD..dgit/dgit/sid\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-native.7.pod:123 +msgid "" +"If you do not merge the NMU into your own git history, the next push will " +"then require I<--overwrite>." +msgstr "" diff --git a/po4a/dgit-nmu-simple_7.pot b/po4a/dgit-nmu-simple_7.pot new file mode 100644 index 0000000..691d136 --- /dev/null +++ b/po4a/dgit-nmu-simple_7.pot @@ -0,0 +1,249 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35 +#, no-wrap +msgid "SUMMARY" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:3 +msgid "dgit-nmu-simple - tutorial for DDs wanting to NMU with git" +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:5 ../dgit-sponsorship.7.pod:5 +msgid "INTRODUCTION AND SCOPE" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:7 +msgid "" +"This tutorial describes how a Debian Developer can do a straightforward NMU " +"of a package in Debian, using dgit." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:11 +msgid "" +"This document won't help you decide whether an NMU is a good idea or whether " +"it be well received. The Debian Developers' Reference has some (sometimes " +"questionable) guidance on this." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:17 +msgid "" +"Conversely, you do not need to know anything about the usual maintainer's " +"git workflow. If appropriate, you can work on many different packages, " +"making similar changes, without worrying about the individual maintainers' " +"git practices." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:23 +msgid "" +"This tutorial only covers changes which can sensibly be expressed as a " +"reasonably small number of linear commits (whether to Debian packaging or to " +"upstream files or both)." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:28 +msgid "" +"If you want to do a new upstream version, you probably want to do as the " +"maintainer would have done. You'll need to find out what the maintainer's " +"git practices are and consult the appropriate C<dgit-maint-*(7)> workflow " +"tutorial," +msgstr "" + +#. type: verbatim +#: ../dgit-nmu-simple.7.pod:39 +#, no-wrap +msgid "" +" % dgit clone glibc jessie\n" +" % cd glibc\n" +" % git am ~/glibc-security-fix.diff\n" +" % dch --nmu \"Apply upstream's fix for foo bug.\"\n" +" % git add debian/changelog && git commit -m\"NMU changelog entry\"\n" +" % dpkg-buildpackage -uc -b\n" +" [ 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" +" [ 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" +"\n" +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:56 +msgid "WHAT KIND OF CHANGES AND COMMITS TO MAKE" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:58 +msgid "" +"When preparing an NMU, the git commits you make on the dgit branch should be " +"simple linear series of commits with good commit messages. The commit " +"messages will be published in various ways, including perhaps being used as " +"the cover messages for generated quilt patches." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:64 +msgid "" +"Do not make merge commits. Do not try to rebase to drop patches - if you " +"need to revert a change which is actually a Debian patch, use git-revert." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:69 +msgid "" +"If you need to modify a Debian patch, make a new commit which fixes what " +"needs fixing, and explain in the commit message which patch it should be " +"squashed with (perhaps by use of a commit message in C<git rebase --" +"autosquash -i> format)." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:76 +msgid "" +"(Of course if you have specific instructions from the maintainer, you can " +"follow those instead. But the procedure in this tutorial is legitimate for " +"any maintainer, in the sense that it should generate an upload to which the " +"maintainer cannot reasonably object.)" +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:82 +msgid "RELEVANT BRANCHES" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:84 +msgid "" +"dgit clone will put you on a branch like C<dgit/sid>. There is a pseudo-" +"remote called C<dgit> which also contains a branch like C<dgit/sid>, so you " +"do things like C<git diff dgit/dgit/sid> to see what changes you have made." +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:90 +msgid "KEEPING YOUR WORKING TREE TIDY" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:92 +msgid "" +"Don't forget to C<git add> any new files you create. Otherwise git clean " +"(which is requested with the C<-wgf> option in the recipe above) will " +"delete them." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:97 +msgid "" +"Many package builds leave dirty git trees. So, commit before building. " +"That way you can use C<git reset --hard>." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:101 +msgid "" +"If you follow this approach you don't need to care about the build dirtying " +"the tree. It also means you don't care about the package clean target, " +"which is just as well because many package clean targets are broken." +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:107 +msgid "OTHER GIT BRANCHES" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:109 +msgid "" +"The dgit git history (visible in gitk and git log) is not necessarily " +"related to the maintainer's or upstream's git history (if any)." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:114 +msgid "" +"If the maintainer has advertised a git repo with Vcs-Git dgit will set up a " +"remote for it, so you can do" +msgstr "" + +#. type: verbatim +#: ../dgit-nmu-simple.7.pod:121 +#, no-wrap +msgid "" +" % git fetch vcs-git\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:125 +msgid "" +"You can cherry pick changes from there, for example. Note that the " +"maintainer's git history may not be suitable for use with dgit. For " +"example, it might be a patches-unapplied branch or even contain only a " +"debian/ directory." +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:131 +msgid "UPLOADING TO DELAYED" +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:133 +msgid "" +"You can use dgit's I<--delayed> option to upload to the DELAYED queue. " +"However, you should read the warning about this option in dgit(1)." +msgstr "" + +#. type: textblock +#: ../dgit-nmu-simple.7.pod:139 +msgid "dgit(1), dgit(7), dgit-maint-*(7)" +msgstr "" diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot new file mode 100644 index 0000000..fb45886 --- /dev/null +++ b/po4a/dgit-sponsorship_7.pot @@ -0,0 +1,527 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../dgit-nmu-simple.7.pod:5 ../dgit-sponsorship.7.pod:5 +msgid "INTRODUCTION AND SCOPE" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#, no-wrap +msgid "" +" % dgit --gbp push\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:3 +msgid "dgit-sponsorship - tutorial for Debian upload sponsorship, using git" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:7 +msgid "" +"This tutorial describes how a Debian sponsored contributor and a sponsoring " +"DD (or DM) can collaborate and publish using git." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:12 +msgid "" +"The sponsor must to be intending to use dgit for the upload. (If the " +"sponsor does not use dgit, it is not possible to properly publish a " +"sponsee's git branch.)" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:17 +msgid "" +"It is best if the sponsee also uses dgit; but also covered (later on) is the " +"case where the sponsee provides a proposed upload in source package form, " +"but the sponsor would like to work in git." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:22 +msgid "" +"This tutorial does not provide a checklist for the sponsor's review. Both " +"contributors are expected to be familiar with Debian packaging and Debian's " +"processes, and with git." +msgstr "" + +#. type: =head1 +#: ../dgit-sponsorship.7.pod:26 +msgid "SPONSEE WORKFLOW" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:28 +msgid "This section is addressed to the sponsee:" +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:30 +msgid "General" +msgstr "" + +#. type: textblock +#: ../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." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:35 +msgid "For a straightforward NMU, consult L<dgit-nmu-simple(7)>." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:37 +msgid "" +"If you are the (prospective) maintainer, you can adopt any suitable (dgit-" +"compatible) git workflow. The L<dgit-maint-*(7)> tutorials describe some " +"of the possibilities." +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:42 +msgid "Upload preparation" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:44 +msgid "" +"You should go through all of the steps a self-uploading maintainer would do, " +"including building for ad hoc tests, and checking via a formal build (eg " +"using C<dgit sbuild>) that the package builds on sid (or the target " +"release)." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:50 +msgid "" +"At the point where you would, if you were a DD, do the actual upload by " +"running dgit push, you hand off to your sponsor." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:56 +msgid "" +"If you were going to use one of the C<--quilt=> options to dgit, or C<dgit --" +"gbp> or C<dgit --dpm>, you must specify that in your handoff email - see " +"below." +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:62 +msgid "git+origs based handoff" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:64 +msgid "The elements of the handoff consists of:" +msgstr "" + +#. type: =item +#: ../dgit-sponsorship.7.pod:68 ../dgit-sponsorship.7.pod:72 +#: ../dgit-sponsorship.7.pod:79 ../dgit-sponsorship.7.pod:84 +msgid "*" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:70 +msgid "The git branch." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:74 +msgid "" +"Any .orig tarballs which will be needed, or sample git-archive(1) or gbp-" +"buildpackage(1) command(s) to generate them." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:81 +msgid "" +"A sample dgit push command, containing any dgit --quilt=, --gbp or --dpm " +"option needed" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:86 +msgid "" +"Plus of course all the usual information about the state of the package, any " +"caveats or areas you would like the sponsor to focus their review, " +"constraints about upload timing, etc." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:93 +msgid "" +"If the handoff is done by email, the elements above should be a in a single, " +"signed, message. This could be an RFS submission against the sponsorship-" +"requests pseudo-package." +msgstr "" + +#. type: =head3 +#: ../dgit-sponsorship.7.pod:98 +msgid "git branch" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:102 +msgid "" +"The sponsee should push their HEAD as a git branch to any suitable git " +"server. They can use their own git server; salsa is another possibility." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:107 +msgid "" +"The branch names used by the sponsee on their local machine, and on the " +"server, do not matter." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:110 +msgid "" +"Instead, the sponsee should include the git commit id of their HEAD in their " +"handover email." +msgstr "" + +#. type: =head3 +#: ../dgit-sponsorship.7.pod:116 +msgid "orig tarballs" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:120 +msgid "" +"If there are any .origs that are not in the archive already, the sponsor " +"will need them as part of the upload." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:123 +msgid "" +"If the sponsee generated these tarballs with git-archive(1) or gbp-" +"buildpackage(1), they can simply include a sample invocation of git-" +"archive(1) or ensure that a suitable gbp.conf is present in the source " +"package to generate the tarball." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:130 +msgid "" +"Otherwise, the simplest approach is to commit the orig tarballs with " +"pristine-tar(1), e.g." +msgstr "" + +#. type: verbatim +#: ../dgit-sponsorship.7.pod:136 +#, no-wrap +msgid "" +" % pristine-tar commit ../foo_1.2.3.orig.tar.xz upstream/1.2.3\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:140 +msgid "" +"and be sure to push the pristine-tar branch. If you are using git-" +"buildpackage(1), just pass I<--git-pristine-tar> and I<--git-pristine-tar-" +"commit>." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:144 +msgid "" +"Alternatively, the sponsee can put them on a suitable webserver, or attach " +"to the e-mail, if they are small." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:149 +msgid "" +"The sponsee should quote sha256sums of the .origs in their handoff email, " +"unless they supplied commands to generate them." +msgstr "" + +#. type: =head3 +#: ../dgit-sponsorship.7.pod:155 +msgid "quilt options" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:159 +msgid "" +"Some workflows involve git branches which are not natively dgit-compatible. " +"Normally dgit will convert them as needed, during push." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:163 +msgid "" +"Supply a sample \"dgit push\" 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 "" + +#. type: =head1 +#: ../dgit-sponsorship.7.pod:179 +msgid "SPONSOR WORKFLOW" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:181 ../dgit-sponsorship.7.pod:273 +msgid "This part is addressed to the sponsor:" +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:183 +msgid "Receiving and validating the sponsorship request" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:185 +msgid "You should check the signature on the email." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:187 +msgid "" +"Use C<git fetch> or C<git clone> to obtain the git branch prepared by your " +"sponsee, and obtain any .origs mentioned by the sponsee (to extract .origs " +"committed with pristine-tar, you can use origtargz(1), or use \"gbp clone --" +"pristine-tar\".)" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:194 +msgid "" +"Check the git commit ID of the sponsee's branch tip, and the sha256sums of " +"the .origs, against the handoff email." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:198 +msgid "Now you can check out the branch tip, and do your substantive review." +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:201 +msgid "Dealing with branches that want --quilt=" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:203 +msgid "" +"If your sponsee mentioned a C<--quilt> option, and you don't want to grapple " +"with their preferred tree format, you can convert their tree into the " +"standard dgit view:" +msgstr "" + +#. type: verbatim +#: ../dgit-sponsorship.7.pod:209 +#, no-wrap +msgid "" +" % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup\n" +" % git checkout unquilted\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:214 +msgid "" +"You should check that what you're looking at is a descendant of the " +"sponsee's branch." +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:217 +msgid "Some hints which may help the review" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:219 +msgid "" +"C<dgit fetch sid> will get you an up-to-date C<refs/remotes/dgit/dgit/sid> " +"showing what's in the archive already." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:223 +msgid "" +"C<dgit -wgf --damp-run push-source> will check that dgit can build an " +"appropriate source package." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:226 +msgid "" +"There is no need to run debdiff. dgit will not upload anything that doesn't " +"unpack to exactly the git commit you are pushing, so you can rely on what " +"you see in C<git diff>." +msgstr "" + +#. type: =head2 +#: ../dgit-sponsorship.7.pod:231 +msgid "Doing the upload" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:233 +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." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:242 +msgid "" +"Check whether the sponsee made a debian/I<version> tag. If they did, ensure " +"you have their tag in the repository you are pushing from, or pass C<--no-" +"dep14tag>. This avoids identically named, non-identical tags, which can be " +"confusing." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:249 +msgid "" +"(It is possible to upload from the quilt-cache dgit view. If you want to do " +"this, B<do not> pass the C<--quilt> or C<--gbp> or C<--dpm> options again, " +"and B<do> pass C<--no-dep14tag>, since the debian/I<version> tag should go " +"on the sponsee's branch.)" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:257 +msgid "" +"If this was the first upload done with dgit, you may need to pass C<--" +"overwrite> to dgit." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:262 +msgid "" +"Alternatively, if this was the first ever dgit push of the package, you can " +"pass C<--deliberately-not-fast-forward> instead of C<--overwrite>. This " +"avoids introducing a new origin commit into the dgit view of the sponsee's " +"git history which is unnecessary and could be confusing." +msgstr "" + +#. type: =head1 +#: ../dgit-sponsorship.7.pod:271 +msgid "SPONSORING A NON-GIT-USING SPONSEE" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:275 +msgid "" +"If your sponsee does not use git, you can still do your review with git, and " +"use dgit for the upload." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:279 +msgid "" +"Your sponsee will provide you with a source package: that is, a .dsc and the " +"files it refers to. Obtain these files, and check signatures as " +"appropriate. Then:" +msgstr "" + +#. type: verbatim +#: ../dgit-sponsorship.7.pod:286 +#, no-wrap +msgid "" +" % dgit clone PACKAGE\n" +" % cd PACKAGE\n" +" % dgit import-dsc /path/to/sponsee's.dsc +sponsee\n" +" % git checkout sponsee\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:293 +msgid "Or for an entirely new package:" +msgstr "" + +#. type: verbatim +#: ../dgit-sponsorship.7.pod:297 +#, no-wrap +msgid "" +" % mkdir PACKAGE\n" +" % cd PACKAGE\n" +" % git init\n" +" % dgit -pPACKAGE import-dsc /path/to/sponsee's.dsc +sponsee\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:304 +msgid "" +"This will leave you looking at the sponsee's package, formatted as a dgit " +"branch." +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." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:312 +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 " +"where changes are accidentally lost. When your sponsee is sending you " +"source packages - perhaps multiple source pacakges with the same version " +"number - these safety catches are inevitably ineffective." +msgstr "" + +#. type: textblock +#: ../dgit-sponsorship.7.pod:323 +msgid "dgit(1), dgit(7), dgit-nmu-simple(7), dgit-maint-*(7)" +msgstr "" diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot new file mode 100644 index 0000000..7ef68ed --- /dev/null +++ b/po4a/dgit-user_7.pot @@ -0,0 +1,707 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35 +#, no-wrap +msgid "SUMMARY" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:3 +msgid "dgit-user - making and sharing changes to Debian packages, with git" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:7 +msgid "" +"dgit lets you fetch the source code to every package on your system as if " +"your distro used git to maintain all of it." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:11 +msgid "" +"You can then edit it, build updated binary packages (.debs) and install and " +"run them. You can also share your work with others." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:16 +msgid "" +"This tutorial gives some recipes and hints for this. It assumes you have " +"basic familiarity with git. It does not assume any initial familiarity with " +"Debian's packaging processes." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:21 +msgid "" +"If you are a package maintainer within Debian; a DM or DD; and/or a sponsee: " +"this tutorial is not for you. Try L<dgit-nmu-simple(7)>, L<dgit-maint-" +"*(7)>, or L<dgit(1)> and L<dgit(7)>." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:29 +msgid "(These runes will be discussed later.)" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:33 +#, no-wrap +msgid "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +" % curl 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:44 +msgid "Occasionally:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:242 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % git reset --hard\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:53 +msgid "Later:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:57 +#, no-wrap +msgid "" +" % cd glibc\n" +" % dgit pull jessie,-security\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:65 +msgid "FINDING THE RIGHT SOURCE CODE - DGIT CLONE" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:69 +#, no-wrap +msgid "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:74 +msgid "" +"dgit clone needs to be told the source package name (which might be " +"different to the binary package name, which was the name you passed to \"apt-" +"get install\") and the codename or alias of the Debian release (this is " +"called the \"suite\")." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:80 +msgid "Finding the source package name" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:82 +msgid "" +"For many packages, the source package name is obvious. Otherwise, if you " +"know a file that's in the package, you can look it up with dpkg:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:88 +#, no-wrap +msgid "" +" % dpkg -S /lib/i386-linux-gnu/libc.so.6 \n" +" libc6:i386: /lib/i386-linux-gnu/libc.so.6\n" +" % dpkg -s libc6:i386\n" +" Package: libc6\n" +" Status: install ok installed\n" +" ...\n" +" Source: glibc\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:98 +#, no-wrap +msgid "" +"(In this example,\n" +"libc6 is a \"multi-arch: allowed\" package,\n" +" which means that it exists in several different builds\n" +" for different architectures.\n" +"That's where C<:i386> comes from.)\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:104 +msgid "Finding the Debian release (the \"suite\")" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:106 +msgid "" +"Internally, Debian (and derived) distros normally refer to their releases by " +"codenames. Debian also has aliases which refer to the current stable " +"release etc. So for example, at the time of writing Debian C<jessie> " +"(Debian 8) is Debian C<stable>; and the current version of Ubuntu is " +"C<yakkety> (Yakkety Yak, 16.10). You can specify either the codename " +"C<jessie> or the alias C<stable>. If you don't say, you get C<sid>, which " +"is Debian C<unstable> - the main work-in progress branch." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:117 +msgid "If you don't know what you're running, try this:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:121 +#, no-wrap +msgid "" +" % grep '^deb' /etc/apt/sources.list\n" +" deb http://the.earth.li/debian/ jessie main non-free contrib\n" +" ...\n" +" %\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:128 +msgid "" +"For Debian, you should add C<,-security> to the end of the suite name, " +"unless you're on unstable or testing. Hence, in our example C<jessie> " +"becomes C<jessie,-security>. (Yes, with a comma.)" +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:135 +msgid "WHAT DGIT CLONE PRODUCES" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:137 +msgid "What branches are there" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:139 +msgid "" +"dgit clone will give you a new working tree, and arrange for you to be on a " +"branch named like C<dgit/jessie,-security> (yes, with a comma in the branch " +"name)." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:143 +msgid "" +"For each release (like C<jessie>) there is a tracking branch for the " +"contents of the archive, called C<remotes/dgit/dgit/jessie> (and similarly " +"for other suites). This can be updated with C<dgit fetch jessie>. This, " +"the I<remote suite branch>, is synthesized by your local copy of dgit. It " +"is fast forwarding." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:152 +msgid "" +"Debian separates out the security updates, into C<*-security>. Telling dgit " +"C<jessie,-security> means that it should include any updates available in " +"C<jessie-security>. The comma notation is a request to dgit to track " +"jessie, or jessie-security if there is an update for the package there." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:158 +msgid "" +"(You can also dgit fetch in a tree that wasn't made by dgit clone. If " +"there's no C<debian/changelog> you'll have to supply a C<-p>I<package> " +"option to dgit fetch.)" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:162 +msgid "What kind of source tree do you get" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:164 +msgid "" +"If the Debian package is based on some upstream release, the code layout " +"should be like the upstream version. You should find C<git grep> helpful to " +"find where to edit." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:168 +msgid "" +"The package's Debian metadata and the scripts for building binary packages " +"are under C<debian/>. C<debian/control>, C<debian/changelog> and C<debian/" +"rules> are the starting points. The Debian Policy Manual has most of the in-" +"depth technical details." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:175 +msgid "" +"For many Debian packages, there will also be some things in C<debian/patches/" +">. It is best to ignore these. Insofar as they are relevant the changes " +"there will have been applied to the actual files, probably by means of " +"actual comments in the git history. The contents of debian/patches are " +"ignored when building binaries from dgitish git branches." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:185 +msgid "" +"(For Debian afficionados: the git trees that come out of dgit are \"patches-" +"applied packaging branches without a .pc directory\".)" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:190 +msgid "What kind of history you get" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:192 +msgid "" +"If you're lucky, the history will be a version of, or based on, the Debian " +"maintainer's own git history, or upstream's git history." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:197 +msgid "" +"But for many packages the real git history does not exist, or has not been " +"published in a dgitish form. So you may find that the history is a rather " +"short history invented by dgit." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:203 +msgid "" +"dgit histories often contain automatically-generated commits, including " +"commits which make no changes but just serve to make a rebasing branch fast-" +"forward. This is particularly true of combining branches like C<jessie,-" +"security>." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:210 +msgid "" +"If the package maintainer is using git then after dgit clone you may find " +"that there is a useful C<vcs-git> remote referring to the Debian package " +"maintainer's repository for the package. You can see what's there with " +"C<git fetch vcs-git>. But use what you find there with care: Debian " +"maintainers' git repositories often have contents which are very confusing " +"and idiosyncratic. In particular, you may need to manually apply the " +"patches that are in debian/patches before you do anything else!" +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56 +msgid "BUILDING" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:224 +msgid "Always commit before building" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:228 +#, no-wrap +msgid "" +" % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:233 +msgid "" +"Debian package builds are often quite messy: they may modify files which are " +"also committed to git, or leave outputs and temporary files not covered by " +"C<.gitignore>." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:237 +msgid "If you always commit, you can use" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:247 +msgid "" +"to tidy up after a build. (If you forgot to commit, don't use those " +"commands; instead, you may find that you can use C<git add -p> to help " +"commit what you actually wanted to keep.)" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:252 +msgid "" +"These are destructive commands which delete all new files (so you B<must> " +"remember to say C<git add>) and throw away edits to every file (so you " +"B<must> remember to commit)." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:257 +msgid "Update the changelog (at least once) before building" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:261 +#, no-wrap +msgid "" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:265 +msgid "" +"The binaries you build will have a version number which ultimately comes " +"from the C<debian/changelog>. You want to be able to tell your binaries " +"apart from your distro's." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:270 +msgid "" +"So you should update C<debian/changelog> to add a new stanza at the top, for " +"your build." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:274 +msgid "" +"This rune provides an easy way to do this. It adds a new changelog entry " +"with an uninformative message and a plausible version number (containing a " +"bit of your git commit id)." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:279 +msgid "" +"If you want to be more sophisticated, the package C<dpkg-dev-el> has a good " +"Emacs mode for editing changelogs. Alternatively, you could edit the " +"changelog with another text editor, or run C<dch> or C<gbp dch> with " +"different options. Choosing a good version number is slightly tricky and a " +"complete treatment is beyond the scope of this tutorial." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:287 +msgid "Actually building" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:291 +#, no-wrap +msgid "" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:296 +msgid "" +"dpkg-buildpackage is the primary tool for building a Debian source package. " +"C<-uc> means not to pgp-sign the results. C<-b> means build all binary " +"packages, but not to build a source package." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:302 +msgid "Using sbuild" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:304 +msgid "" +"You can build in an schroot chroot, with sbuild, instead of in your main " +"environment. (sbuild is used by the Debian build daemons.)" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:309 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % sbuild -c jessie -A --no-clean-source \\\n" +" --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:315 +msgid "" +"Note that this will seem to leave a \"source package\" (.dsc and .tar.gz) " +"in the parent directory, but that source package should not be used. It is " +"likely to be broken. For more information see Debian bug #868527." +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:322 +msgid "INSTALLING" +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:324 +msgid "Debian Jessie or older" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:328 +#, no-wrap +msgid "" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:332 +msgid "" +"You can use C<dpkg -i> to install the .debs that came out of your package." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:335 +msgid "" +"If the dependencies aren't installed, you will get an error, which can " +"usually be fixed with C<apt-get -f install>." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:339 +msgid "Debian Stretch or newer" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:343 +#, no-wrap +msgid "" +" % sudo apt install ../libc6_*.deb\n" +"\n" +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:347 +msgid "Multiarch" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:349 +msgid "" +"If you're working on a library package and your system has multiple " +"architectures enabled, you may see something like this:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:355 +#, no-wrap +msgid "" +" dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" +" package libpcre3-dev:amd64 2:8.39-3~3.gbp8f25f5 cannot be configured because libpcre3-dev:i386 is at a different version (2:8.39-2)\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:360 +msgid "" +"The multiarch system used by Debian requires each package which is present " +"for multiple architectures to be exactly the same across all the " +"architectures for which it is installed." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:364 +msgid "" +"The proper solution is to build the package for all the architectures you " +"have enabled. You'll need a chroot for each of the secondary " +"architectures. This is somewhat tiresome, even though Debian has excellent " +"tools for managing chroots. C<sbuild-debian-developer-setup> from the " +"package of the same name and C<sbuild-createchroot> from the C<sbuild> " +"package are good starting points." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:374 +msgid "" +"Otherwise you could deinstall the packages of interest for those other " +"architectures with something like C<dpkg --remove libpcre3:i386>." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:378 +msgid "" +"If neither of those are an option, your desperate last resort is to try " +"using the same version number as the official package for your own package. " +"(The version is controlled by C<debian/changelog> - see above). This is not " +"ideal because it makes it hard to tell what is installed, and because it " +"will mislead and confuse apt." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:386 +msgid "With the \"same number\" approach you may still get errors like" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:390 +msgid "" +"trying to overwrite shared '/usr/include/pcreposix.h', which is different " +"from other instances of package libpcre3-dev" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:394 +msgid "" +"but passing C<--force-overwrite> to dpkg will help - assuming you know what " +"you're doing." +msgstr "" + +#. type: =head1 +#: ../dgit-user.7.pod:397 +msgid "SHARING YOUR WORK" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:399 +msgid "" +"The C<dgit/jessie,-security> branch (or whatever) is a normal git branch. " +"You can use C<git push> to publish it on any suitable git server." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:402 +msgid "" +"Anyone who gets that git branch from you will be able to build binary " +"packages (.deb) just as you did." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:406 +msgid "" +"If you want to contribute your changes back to Debian, you should probably " +"send them as attachments to an email to the L<Debian Bug System|https://bugs." +"debian.org/> (either a followup to an existing bug, or a new bug). Patches " +"in C<git-format-patch> format are usually very welcome." +msgstr "" + +#. type: =head2 +#: ../dgit-user.7.pod:413 +msgid "Source packages" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:415 +msgid "" +"The git branch is not sufficient to build a source package the way Debian " +"does. Source packages are somewhat awkward to work with. Indeed many " +"plausible git histories or git trees cannot be converted into a suitable " +"source package. So I recommend you share your git branch instead." +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:423 +msgid "" +"If a git branch is not enough, and you need to provide a source package but " +"don't care about its format/layout (for example because some software you " +"have consumes source packages, not git histories) you can use this recipe " +"to generate a C<3.0 (native)> source package, which is just a tarball with " +"accompanying .dsc metadata file:" +msgstr "" + +#. type: verbatim +#: ../dgit-user.7.pod:434 +#, no-wrap +msgid "" +" % echo '3.0 (native)' >debian/source/format\n" +" % git commit -m 'switch to native source format' debian/source/format\n" +" % dgit -wgf build-source\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-user.7.pod:440 +msgid "" +"If you need to provide a good-looking source package, be prepared for a lot " +"more work. You will need to read much more, perhaps starting with L<dgit-" +"nmu-simple(7)>, L<dgit-sponsorship(7)> or L<dgit-maint-*(7)>" +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 +msgid "dgit(1), dgit(7)" +msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot new file mode 100644 index 0000000..8a7fd86 --- /dev/null +++ b/po4a/dgit_1.pot @@ -0,0 +1,2645 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: TH +#: ../dgit.1:2 ../dgit.7:1 +#, no-wrap +msgid "dgit" +msgstr "" + +#. type: TH +#: ../dgit.1:2 ../dgit.7:1 +#, no-wrap +msgid "Debian Project" +msgstr "" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: Plain text +#: ../dgit.1:5 +msgid "dgit - git integration with the Debian archive" +msgstr "" + +#. type: SH +#: ../dgit.1:6 +#, no-wrap +msgid "SYNOPSIS" +msgstr "" + +#. type: Plain text +#: ../dgit.1:10 +msgid "" +"B<dgit> [I<dgit-opts>] B<clone> [I<dgit-opts>] I<package> [I<suite>] [B<./" +">I<dir|>B</>I<dir>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:14 +msgid "B<dgit> [I<dgit-opts>] B<fetch>|B<pull> [I<dgit-opts>] [I<suite>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:18 +msgid "" +"B<dgit> [I<dgit-opts>] B<build>|B<sbuild>|B<build-source> [I<build-opts>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:22 +msgid "B<dgit> [I<dgit-opts>] B<pbuilder>|B<cowbuilder> [I<debbuildopts>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:26 +msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-source> [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..." +">]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:33 +msgid "B<dgit> [I<dgit-opts>] I<action> ..." +msgstr "" + +#. type: SH +#: ../dgit.1:33 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: Plain text +#: ../dgit.1:41 +msgid "" +"B<dgit> allows you to treat the Debian archive as if it were a git " +"repository. Conversely, it allows Debian to publish the source of its " +"packages as git branches, in a format which is directly useable by ordinary " +"people." +msgstr "" + +#. type: Plain text +#: ../dgit.1:44 +msgid "This is the command line reference. Please read the tutorial(s):" +msgstr "" + +#. type: tbl table +#: ../dgit.1:46 +#, no-wrap +msgid "dgit-user(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:46 +#, no-wrap +msgid "for users: edit, build and share packages" +msgstr "" + +#. type: tbl table +#: ../dgit.1:47 +#, no-wrap +msgid "dgit-nmu-simple(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:47 +#, no-wrap +msgid "for DDs: do a straightforward NMU" +msgstr "" + +#. type: tbl table +#: ../dgit.1:48 +#, no-wrap +msgid "dgit-maint-native(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:48 +#, no-wrap +msgid "for maintainers of Debian-native packages" +msgstr "" + +#. type: tbl table +#: ../dgit.1:49 +#, no-wrap +msgid "dgit-maint-debrebase(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:49 +#, no-wrap +msgid "for maintainers: a pure-git rebasish workflow" +msgstr "" + +#. type: tbl table +#: ../dgit.1:50 +#, no-wrap +msgid "dgit-maint-merge(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:50 +#, no-wrap +msgid "for maintainers: a pure-git merging workflow" +msgstr "" + +#. type: tbl table +#: ../dgit.1:51 +#, no-wrap +msgid "dgit-maint-gbp(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:51 +#, no-wrap +msgid "for maintainers already using git-buildpackage" +msgstr "" + +#. type: tbl table +#: ../dgit.1:52 +#, no-wrap +msgid "dgit-sponsorship(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:52 +#, no-wrap +msgid "for sponsors and sponsored contributors" +msgstr "" + +#. type: tbl table +#: ../dgit.1:53 +#, no-wrap +msgid "dgit-downstream-dsc(7)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:53 +#, no-wrap +msgid "setting up dgit push for a new distro" +msgstr "" + +#. type: Plain text +#: ../dgit.1:60 +msgid "" +"See B<dgit(7)> for detailed information about the data model, common " +"problems likely to arise with certain kinds of package, etc." +msgstr "" + +#. type: SH +#: ../dgit.1:60 +#, no-wrap +msgid "OPERATIONS" +msgstr "" + +#. type: TP +#: ../dgit.1:61 +#, no-wrap +msgid "B<dgit clone> I<package> [I<suite>] [B<./>I<dir|>B</>I<dir>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:74 +msgid "" +"Consults the archive and dgit-repos to construct the git view of history for " +"I<package> in I<suite> (B<sid> by default) in a new directory (named B<./" +">I<package> by default); also, downloads any necessary orig tarballs." +msgstr "" + +#. type: Plain text +#: ../dgit.1:85 +msgid "" +"The suite's git tip is left on the local branch B<dgit/>I<suite> ready for " +"work, and on the corresponding dgit remote tracking branch. The B<origin> " +"remote will be set up to point to the package's dgit-repos tree for the " +"distro to which I<suite> belongs." +msgstr "" + +#. type: Plain text +#: ../dgit.1:90 +msgid "" +"I<suite> may be a combination of several underlying suites in the form " +"I<mainsuite>B<,>I<subsuite>...; see COMBINED SUITES in dgit(7)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:97 +msgid "" +"For your convenience, the B<vcs-git> remote will be set up from the " +"package's Vcs-Git field, if there is one - but note that in the general case " +"the history found there may be different to or even disjoint from dgit's " +"view. (See also dgit update-vcs-git.)" +msgstr "" + +#. type: TP +#: ../dgit.1:97 +#, no-wrap +msgid "B<dgit fetch> [I<suite>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:110 +msgid "" +"Consults the archive and git-repos to update the git view of history for a " +"specific suite (and downloads any necessary orig tarballs), and updates the " +"remote tracking branch B<remotes/dgit/dgit/>I<suite>. If the current branch " +"is B<dgit/>I<suite> then dgit fetch defaults to I<suite>; otherwise it " +"parses debian/changelog and uses the suite specified there. suite may be a " +"combined suite, as for clone." +msgstr "" + +#. type: TP +#: ../dgit.1:110 +#, no-wrap +msgid "B<dgit pull> [I<suite>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:116 +msgid "" +"Does dgit fetch, and then merges the new head of the remote tracking branch " +"B<remotes/dgit/dgit/>I<suite> into the current branch." +msgstr "" + +#. type: TP +#: ../dgit.1:116 +#, no-wrap +msgid "B<dgit checkout> I<suite>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:120 +msgid "Checks out the local branch B<dgit/>I<suite>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:127 +msgid "" +"If the branch does not exist, dgit checkout creates it, and sets it up the " +"same way as dgit clone would. In that case, if the archive remote tracking " +"branch does not exist, dgit checkout will do a dgit fetch first." +msgstr "" + +#. type: Plain text +#: ../dgit.1:132 +msgid "" +"NB: dgit checkout will only do a fetch if it has to. If you already have " +"the suite branch, and want to merge your branch with updates from the " +"archive, use dgit pull." +msgstr "" + +#. type: Plain text +#: ../dgit.1:137 +msgid "" +"dgit checkout will normally need to aceess the archive server, to " +"canonicalise the provided suite name. The exception is if you specify the " +"canonical name, and the branch (or tracking branch) already exists." +msgstr "" + +#. type: TP +#: ../dgit.1:137 +#, no-wrap +msgid "B<dgit build> ..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:146 +msgid "" +"Runs B<dpkg-buildpackage> with some suitable options. Options and arguments " +"after build will be passed on to dpkg-buildpackage. It is not necessary to " +"use dgit build when using dgit; it is OK to use any approach which ensures " +"that the generated source package corresponds to the relevant git commit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:148 ../dgit.1:200 ../dgit.1:240 +msgid "Tagging, signing and actually uploading should be left to dgit push." +msgstr "" + +#. type: Plain text +#: ../dgit.1:152 +msgid "" +"dgit's build operations access the the network, to get the -v option right. " +"See -v, below." +msgstr "" + +#. type: TP +#: ../dgit.1:152 +#, no-wrap +msgid "B<dgit build-source> ..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:161 +msgid "" +"Builds the source package, and a changes file for a prospective source-only " +"upload, using B<dpkg-source>. The output is left in " +"I<package>B<_>I<version>B<.dsc> and I<package>B<_>I<version>B<_source." +"changes>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:164 +msgid "" +"Tagging, signing and actually uploading should be left to dgit push-source, " +"or dgit push." +msgstr "" + +#. type: TP +#: ../dgit.1:164 +#, no-wrap +msgid "B<dgit clean>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:168 +msgid "" +"Cleans the current working tree (according to the --clean= option in force)." +msgstr "" + +#. type: TP +#: ../dgit.1:168 +#, no-wrap +msgid "B<dgit update-vcs-git> [I<suite>|B<.>] [B<-->] [I<git fetch options>]" +msgstr "" + +#. type: TQ +#: ../dgit.1:170 +#, no-wrap +msgid "B<dgit update-vcs-git> [I<suite|>B<.>] B<->" +msgstr "" + +#. type: Plain text +#: ../dgit.1:175 +msgid "" +"Sets up, or updates the url of, the vcs-git remote, and (unless B<-> was " +"specified) runs git fetch on it." +msgstr "" + +#. type: Plain text +#: ../dgit.1:182 +msgid "" +"By default, the Vcs-Git field of the .dsc from Debian sid is used, as that " +"is probably most up to date. Another suite may be specified, or B<.> to " +"indicate that the Vcs-Git of the cwd's debian/control should be used instead." +msgstr "" + +#. type: TP +#: ../dgit.1:182 +#, no-wrap +msgid "B<dgit help>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:185 ../dgit.1:1123 +msgid "Print a usage summary." +msgstr "" + +#. type: TP +#: ../dgit.1:185 +#, no-wrap +msgid "B<dgit sbuild> ..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:194 +msgid "" +"Constructs the source package, uses B<sbuild> to do a binary build, and uses " +"mergechanges to merge the source and binary changes files. Options and " +"arguments after sbuild will be passed on to sbuild. The output is left in " +"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 +#, no-wrap +msgid "B<dgit pbuilder> [I<debbuildopts>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:208 +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 " +"is left in I<package>B<_>I<version>B<_multi.changes>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:211 +msgid "" +"You should ensure that your dgit --build-products-dir setting matches your " +"pbuilder --buildresult." +msgstr "" + +#. type: Plain text +#: ../dgit.1:217 +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 " +"option as described below (remember that dgit options should appear between " +"B<dgit> and B<pbuilder>)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:223 +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 +#, no-wrap +msgid "B<dgit cowbuilder> [I<debbuildopts>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:229 +msgid "Like B<dgit pbuilder>, but uses B<cowbuilder> instead of B<pbuilder.>" +msgstr "" + +#. type: TP +#: ../dgit.1:229 +#, no-wrap +msgid "B<dgit gbp-build> ..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:235 +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 +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 +#, no-wrap +msgid "B<dgit push> [I<suite>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:249 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.1:259 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.1:263 +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 " +"suite then that must match too." +msgstr "" + +#. type: Plain text +#: ../dgit.1:268 +msgid "" +"When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " +"branch for source package upload and push." +msgstr "" + +#. type: TP +#: ../dgit.1:268 +#, no-wrap +msgid "B<dgit push-source> [I<suite>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:273 +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.\"" +msgstr "" + +#. type: Plain text +#: ../dgit.1:276 +msgid "" +"With B<-C>, performs a dgit push, additionally ensuring that no binary " +"packages are uploaded." +msgstr "" + +#. type: TP +#: ../dgit.1:276 +#, no-wrap +msgid "B<dgit rpush> I<build-host>B<:>I<build-dir> [I<push args...>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:283 +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:" +msgstr "" + +#. type: =item +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#, no-wrap +msgid "1." +msgstr "" + +#. type: tbl table +#: ../dgit.1:286 +#, no-wrap +msgid "Clone on build host (dgit clone)" +msgstr "" + +#. type: =item +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#, no-wrap +msgid "2." +msgstr "" + +#. type: tbl table +#: ../dgit.1:287 +#, no-wrap +msgid "Edit code on build host (edit, git commit)" +msgstr "" + +#. type: =item +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#, no-wrap +msgid "3." +msgstr "" + +#. type: tbl table +#: ../dgit.1:288 +#, no-wrap +msgid "Build package on build host (dgit build)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:289 +#, no-wrap +msgid "4." +msgstr "" + +#. type: tbl table +#: ../dgit.1:289 +#, no-wrap +msgid "Test package on build host or elsewhere (dpkg -i, test)" +msgstr "" + +#. type: tbl table +#: ../dgit.1:290 +#, no-wrap +msgid "5." +msgstr "" + +#. type: tbl table +#: ../dgit.1:290 +#, no-wrap +msgid "Upload by invoking dgit rpush on host with your GPG key." +msgstr "" + +#. type: Plain text +#: ../dgit.1:296 +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 " +"use of ssh agent forwarding." +msgstr "" + +#. type: Plain text +#: ../dgit.1:299 +msgid "" +"The remaining arguments are treated just as dgit push would handle them." +msgstr "" + +#. type: Plain text +#: ../dgit.1:304 +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 " +"one in [ ], to support IPv6 address literals)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:308 +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 " +"in its keyring (but not your private key, obviously)." +msgstr "" + +#. type: TP +#: ../dgit.1:308 +#, no-wrap +msgid "B<dgit setup-new-tree>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:324 +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 " +"B<setup-gitattributes> (but only does each thing if dgit is configured to do " +"it automatically). You can use these in any git repository, not just ones " +"used with the other dgit operations. Does B<not> run B<update-vcs-git> (as " +"that requires Debian packaging information)." +msgstr "" + +#. type: TP +#: ../dgit.1:324 +#, no-wrap +msgid "B<dgit setup-useremail>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:330 +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-" +"email>), or DEBFULLNAME or DEBEMAIL." +msgstr "" + +#. type: TP +#: ../dgit.1:330 +#, no-wrap +msgid "B<dgit setup-mergechangelogs>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:336 +msgid "" +"Configures a git merge helper for the file B<debian/changelog> which uses " +"B<dpkg-mergechangelogs>." +msgstr "" + +#. type: TP +#: ../dgit.1:336 +#, no-wrap +msgid "B<dgit setup-gitattributes>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:351 +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 " +"attribute B<dgit-defuse-attrs> and applying it to B<*>. For why, see " +"B<GITATTRIBUTES> in B<dgit(7)>. Note that only attributes affecting the " +"working tree are suppressed. git-archive may remain exciting." +msgstr "" + +#. type: Plain text +#: ../dgit.1:359 +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 " +"earlier version of dgit and git has since introduced new transforming " +"attributes, modifies the macro to disable the newer transformations." +msgstr "" + +#. type: Plain text +#: ../dgit.1:370 +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 " +"effects), this operation does nothing further. This fact can be used to " +"defeat or partially defeat dgit setup-gitattributes and hence dgit setup-new-" +"tree.)" +msgstr "" + +#. type: TP +#: ../dgit.1:370 +#, no-wrap +msgid "B<dgit quilt-fixup>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:377 +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 " +"this has been done; if not, dgit will make appropriate patches in debian/" +"patches and also commit the resulting changes to git." +msgstr "" + +#. type: Plain text +#: ../dgit.1:379 +msgid "This is normally done automatically by dgit build and dgit push." +msgstr "" + +#. type: Plain text +#: ../dgit.1:385 +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 " +"of more exotic history. If dgit can't find a suitable linearisation of your " +"history, by default it will fail, but you can ask it to generate a single " +"squashed patch instead." +msgstr "" + +#. type: Plain text +#: ../dgit.1:394 +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 " +"git-debrebase fails, so dgit quilt-fixup can be useful in its own right. To " +"always use dgit's own patch generator instead of git-debrebase make-patches, " +"pass --git-debrebase=true to dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:399 +msgid "See B<FORMAT 3.0 (QUILT)> in B<dgit(7)>." +msgstr "" + +#. type: TP +#: ../dgit.1:399 +#, no-wrap +msgid "B<dgit import-dsc> [I<sub-options>] I<../path/to/.dsc> [B<+>|B<..>]branch" +msgstr "" + +#. type: Plain text +#: ../dgit.1:405 +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 +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 " +"package archive or knowledge of the history it does not consider whether " +"this version is newer than any previous import or corresponding git " +"branches; and it therefore does not make a pseudomerge to bind the import " +"into any existing git history." +msgstr "" + +#. type: Plain text +#: ../dgit.1:426 +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 " +"table), import-dsc might need online access. If this is a problem (or " +"dgit's efforts to find the commit fail), consider --no-chase-dsc-distro or --" +"force-import-dsc-with-dgit-field." +msgstr "" + +#. type: Plain text +#: ../dgit.1:428 +msgid "There is only only sub-option:" +msgstr "" + +#. type: Plain text +#: ../dgit.1:434 +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, " +"dgit tries to verify the signature but the outcome is reported only as " +"messages to stderr." +msgstr "" + +#. type: Plain text +#: ../dgit.1:453 +msgid "" +"If I<branch> is prefixed with B<+> then if it already exists, it will be " +"simply ovewritten, no matter its existing contents. If I<branch> is " +"prefixed with B<..> then if it already exists and dgit actually imports the " +"dsc (rather than simply reading the git commit out of the Dgit field), dgit " +"will make a pseudomerge so that the result is necessarily fast forward from " +"the existing branch. Otherwise, if branch already exists, dgit will stop " +"with an error message." +msgstr "" + +#. type: Plain text +#: ../dgit.1:457 +msgid "If I<branch> does not start with refs/, refs/heads/ is prepended." +msgstr "" + +#. type: TP +#: ../dgit.1:457 +#, no-wrap +msgid "B<dgit version>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:460 +msgid "Prints version information and exits." +msgstr "" + +#. type: TP +#: ../dgit.1:460 +#, no-wrap +msgid "B<dgit clone-dgit-repos-server>I< destdir>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:464 +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 +#, no-wrap +msgid "B<dgit print-dgit-repos-server-source-url>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:469 +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 +#, no-wrap +msgid "B<dgit print-dpkg-source-ignores>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:476 +msgid "" +"Prints the -i and -I arguments which must be passed to dpkg-souce to cause " +"it to exclude exactly the .git diredcory and nothing else. The separate " +"arguments are unquoted, separated by spaces, and do not contain spaces." +msgstr "" + +#. type: TP +#: ../dgit.1:476 +#, no-wrap +msgid "B<dgit print-unapplied-treeish>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:487 +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 " +"appropriate .orig tarballs. This tree object is identical to your .origs as " +"regards upstream files. The contents of the debian subdirectory is not " +"interesting and should not be inspected; except that debian/patches will be " +"identical to your HEAD." +msgstr "" + +#. type: Plain text +#: ../dgit.1:494 +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 " +"name from the changelog, or (of course) dgit.default.build-products-dir. " +"See ACCESS CONFIGURATION, below." +msgstr "" + +#. type: Plain text +#: ../dgit.1:496 +msgid "This function is primarily provided for the benefit of git-debrebase." +msgstr "" + +#. type: =head1 +#: ../dgit.1:496 ../git-debrebase.1.pod:441 +#, 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 +#, no-wrap +msgid "B<-k>I<keyid>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:517 +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 " +"that, the uploader trailer line in debian/changelog." +msgstr "" + +#. type: TP +#: ../dgit.1:517 +#, no-wrap +msgid "B<--no-sign>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:520 +msgid "does not sign tags or uploads (meaningful only with push)." +msgstr "" + +#. type: TP +#: ../dgit.1:521 +#, no-wrap +msgid "B<-p>I<package>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:527 +msgid "" +"Specifies that we should process source package I<package> rather than " +"looking in debian/control or debian/changelog. Valid with dgit fetch and " +"dgit pull, only." +msgstr "" + +#. type: TP +#: ../dgit.1:527 +#, no-wrap +msgid "B<--clean=git> | B<-wg>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:533 +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 +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 +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-" +"dependencies." +msgstr "" + +#. type: TP +#: ../dgit.1:541 +#, no-wrap +msgid "B<--clean=git-ff> | B<-wgf>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:550 +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 " +"only unusual packages are likely to create)." +msgstr "" + +#. type: TP +#: ../dgit.1:550 +#, no-wrap +msgid "B<--clean=check> | B<-wc>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:556 +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: TP +#: ../dgit.1:556 +#, no-wrap +msgid "B<--clean=none> | B<-wn>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:564 +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 " +"which are not in git, or if the build creates such files, a subsequent dgit " +"push will fail." +msgstr "" + +#. type: TP +#: ../dgit.1:564 +#, no-wrap +msgid "B<--clean=dpkg-source> | B<-wd>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:570 +msgid "" +"Use dpkg-buildpackage to do the clean, so that the source package is cleaned " +"by dpkg-source running the package's clean target. This is the default. " +"Requires the package's build dependencies." +msgstr "" + +#. type: TP +#: ../dgit.1:570 +#, no-wrap +msgid "B<--clean=dpkg-source-d> | B<-wdd>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:580 +msgid "" +"Use B<dpkg-buildpackage -d> to do the clean, so that the source package is " +"cleaned by dpkg-source running the package's clean target. The build-" +"dependencies are not checked (due to B<-d>), which violates policy, but may " +"work in practice." +msgstr "" + +#. type: TP +#: ../dgit.1:580 +#, no-wrap +msgid "B<-N> | B<--new>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:586 +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." +msgstr "" + +#. type: TP +#: ../dgit.1:586 +#, no-wrap +msgid "B<--include-dirty>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:594 +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 " +"with build, if you plan to commit later. (dgit push will still ensure that " +"the .dsc you upload and the git tree you push are identical, so this option " +"won't make broken pushes.)" +msgstr "" + +#. type: TP +#: ../dgit.1:594 +#, no-wrap +msgid "B<--ignore-dirty>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:597 +msgid "Deprecated alias for --include-dirty." +msgstr "" + +#. type: TP +#: ../dgit.1:597 +#, no-wrap +msgid "B<--overwrite>[=I<previous-version>]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:608 +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-" +"version>. This promise is needed when your git branch is not a descendant " +"of the version in the archive according to the git revision history." +msgstr "" + +#. type: Plain text +#: ../dgit.1:615 +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:619 +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 " +"branch a fast forward from the NMU." +msgstr "" + +#. type: Plain text +#: ../dgit.1:625 +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:639 +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 " +"changes, even with B<--overwrite>, unless someone committed to git a " +"finalised changelog entry, and then made later changes to that version.) If " +"I<previous-version> is specified, it ought to be the version currently in " +"the archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:645 +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 " +"archive's version into your own git history, so that your push is a fast " +"forward from the archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:650 +msgid "" +"(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the " +"dgit view and the maintainer view, the pseudo-merge will appear only in the " +"dgit view.)" +msgstr "" + +#. type: TP +#: ../dgit.1:650 +#, no-wrap +msgid "B<--delayed>=I<days>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:653 +msgid "Upload to a DELAYED queue." +msgstr "" + +#. type: Plain text +#: ../dgit.1:663 +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 " +"git branch on the dgit git server. Other dgit users will then see your push " +"(with a warning message from dgit) even though the maintainer wanted to " +"abolish it. Such users might unwittingly reintroduce your changes." +msgstr "" + +#. type: Plain text +#: ../dgit.1:668 +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:668 +#, no-wrap +msgid "B<--no-chase-dsc-distro>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:674 +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:684 +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 " +"with, even if the .dsc was copied verbatim from another distro. For import-" +"dsc, disabling chasing means dgit will work completely offline." +msgstr "" + +#. type: Plain text +#: ../dgit.1:692 +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 " +"that rewrite from being effective. Also, it can mean that dgit fails to " +"find necessary git commits." +msgstr "" + +#. type: TP +#: ../dgit.1:692 +#, no-wrap +msgid "B<--save-dgit-view=>I<branch>|I<ref>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:702 +msgid "" +"Specifies that when a split view quilt mode is in operation, and dgit " +"calculates (or looks up in its cache) a dgit view corresponding to your " +"HEAD, the dgit view will be left in I<ref>. The specified ref is " +"unconditionally overwritten, so don't specify a branch you want to keep." +msgstr "" + +#. type: Plain text +#: ../dgit.1:709 +msgid "" +"This option is effective only with the following operations: quilt-fixup; " +"push; all builds. And it is only effective with --[quilt=]gbp, --" +"[quilt=]dpm, --quilt=unpatched." +msgstr "" + +#. type: Plain text +#: ../dgit.1:713 +msgid "" +"If ref does not start with refs/ it is taken to to be a branch - i.e. refs/" +"heads/ is prepended." +msgstr "" + +#. type: Plain text +#: ../dgit.1:717 +msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." +msgstr "" + +#. type: TP +#: ../dgit.1:717 +#, no-wrap +msgid "B<--deliberately->I<something>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:731 +msgid "" +"Declare that you are deliberately doing I<something>. This can be used to " +"override safety catches, including safety catches which relate to distro-" +"specific policies. The use of --deliberately is declared and published in " +"the signed tags generated for you by dgit, so that the archive software can " +"give effect to your intent, and for the benefit humans looking at the " +"history. The meanings of I<something>s understood in the context of Debian " +"are discussed below:" +msgstr "" + +#. type: TP +#: ../dgit.1:731 +#, no-wrap +msgid "B<--deliberately-not-fast-forward>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:737 +msgid "" +"Declare that you are deliberately rewinding history. When pushing to " +"Debian, use this when you are making a renewed upload of an entirely new " +"source package whose previous version was not accepted for release from NEW " +"because of problems with copyright or redistributibility." +msgstr "" + +#. type: Plain text +#: ../dgit.1:748 +msgid "" +"In split view quilt modes, this also prevents the construction by dgit of a " +"pseudomerge to make the dgit view fast forwarding. Normally only one of --" +"overwrite (which creates a suitable pseudomerge) and --deliberately-not-" +"fast-forward (which suppresses the pseudomerge and the fast forward checks) " +"should be needed; --overwrite is usually better." +msgstr "" + +#. type: TP +#: ../dgit.1:748 +#, no-wrap +msgid "B<--deliberately-include-questionable-history>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:757 +msgid "" +"Declare that you are deliberately including, in the git history of your " +"current push, history which contains a previously-submitted version of this " +"package which was not approved (or has not yet been approved) by the " +"ftpmasters. When pushing to Debian, only use this option after verifying " +"that: none of the rejected-from-NEW (or never-accepted) versions in the git " +"history of your current push, were rejected by ftpmaster for copyright or " +"redistributability reasons." +msgstr "" + +#. type: TP +#: ../dgit.1:757 +#, no-wrap +msgid "B<--deliberately-fresh-repo>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:762 +msgid "" +"Declare that you are deliberately rewinding history and want to throw away " +"the existing repo. Not relevant when pushing to Debian, as the Debian " +"server will do this automatically when necessary." +msgstr "" + +#. type: TP +#: ../dgit.1:762 +#, no-wrap +msgid "B<--quilt=linear>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:769 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.1:774 +msgid "" +"HEAD should be a series of plain commits (not touching debian/patches/), and " +"pseudomerges, with as ancestor a patches-applied branch." +msgstr "" + +#. type: TP +#: ../dgit.1:774 +#, no-wrap +msgid "B<--quilt=auto>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:783 +msgid "" +"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " +"linear patch stack (as with --quilt=auto) but if that doesn't seem " +"possible, try to generate a single squashed patch for all the changes made " +"in git (as with --quilt=smash). This is not a good idea for an NMU in " +"Debian." +msgstr "" + +#. type: TP +#: ../dgit.1:783 +#, no-wrap +msgid "B<--quilt=smash>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:788 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.1:794 +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 " +"not change the upstream version nor make changes in debian/patches, it will " +"remain true.)" +msgstr "" + +#. type: TP +#: ../dgit.1:794 +#, no-wrap +msgid "B<--quilt=nofix>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:802 +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.)" +msgstr "" + +#. type: TP +#: ../dgit.1:802 +#, no-wrap +msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:807 +msgid "" +"Do not check whether up source format `3.0 (quilt)' metadata needs fixing " +"up. If you use this option and the metadata did in fact need fixing up, " +"dgit push will fail." +msgstr "" + +#. type: TP +#: ../dgit.1:807 +#, no-wrap +msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:814 +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:822 +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 " +"contain changes to upstream .gitignore files. This is the default for dgit " +"gbp-build." +msgstr "" + +#. type: Plain text +#: ../dgit.1:830 +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 " +"changes to upstream .gitignore files." +msgstr "" + +#. type: Plain text +#: ../dgit.1:835 +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 " +"patches in debian/patches)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:853 +msgid "" +"With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " +"and build) will automatically generate a conversion of your git branch into " +"the right form. dgit push will push the dgit-compatible form (the B<dgit " +"view>) to the dgit git server. The dgit view will be visible to you in the " +"dgit remote tracking branches, but your own branch will not be modified. " +"dgit push will create a tag B<debian/>I<version> for the maintainer view, " +"and the dgit tag B<archive/debian/>I<version> for the dgit view. dgit quilt-" +"fixup will merely do some checks, and cache the maintainer view." +msgstr "" + +#. type: Plain text +#: ../dgit.1:862 +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 " +"patches-unapplied git branch of a package with one patch, for example, looks " +"very like a patches-applied branch where the user has used git revert to " +"undo the patch, expecting to actually revert it. However, if you fail to " +"specify the right --quilt option, and you aren't too lucky, dgit will notice " +"the problem and stop, with a useful hint." +msgstr "" + +#. type: TP +#: ../dgit.1:862 +#, no-wrap +msgid "B<-d>I<distro> | B<--distro=>I<distro>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:871 +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-" +"suite.>I<suite>B<.distro>. The only effect is that other configuration " +"variables (used for accessing the archive and dgit-repos) used are B<dgit-" +"distro.>I<distro>B<.*>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:877 +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 " +"suite. For example, specifying B<-ddebian> will work when the suite is an " +"unknown suite in the Debian archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:882 +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 " +"archive and in dgit-repos. How to set this up is not yet documented." +msgstr "" + +#. type: TP +#: ../dgit.1:882 +#, no-wrap +msgid "B<-C>I<changesfile>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:887 +msgid "" +"Specifies the .changes file which is to be uploaded. By default dgit push " +"looks for single .changes file in the parent directory whose filename " +"suggests it is for the right package and version." +msgstr "" + +#. type: Plain text +#: ../dgit.1:896 +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 " +"changes file is expected in that directory (by default, in B<..>)." +msgstr "" + +#. type: TP +#: ../dgit.1:896 +#, no-wrap +msgid "B<--rm-old-changes>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:908 +msgid "" +"When doing a build, delete any changes files matching " +"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " +"dgit push (and dgit sbuild) will be able to unambigously identify the " +"relevant changes files from the most recent build, even if there have been " +"previous builds with different tools or options. The default is not to " +"remove, but B<--no-rm-old-changes> can be used to override a previous --rm-" +"old-changes or the .rm-old-changes configuration setting." +msgstr "" + +#. type: Plain text +#: ../dgit.1:911 +msgid "" +"Note that B<dgit push-source> will always find the right .changes, " +"regardless of this option." +msgstr "" + +#. type: TP +#: ../dgit.1:911 +#, no-wrap +msgid "B<--build-products-dir=>I<directory>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:915 +msgid "" +"Specifies where to find and create tarballs, binry packages, source " +"packages, .changes files, and so on." +msgstr "" + +#. type: Plain text +#: ../dgit.1:918 +msgid "By default, dgit uses the parent directory (B<..>)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:927 +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-" +"dir> configuration setting (see CONFIGURATION, below) which this command " +"line option overrides)." +msgstr "" + +#. type: TP +#: ../dgit.1:927 +#, no-wrap +msgid "B<--no-rm-on-error>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:930 +msgid "Do not delete the destination directory if clone fails." +msgstr "" + +#. type: TP +#: ../dgit.1:930 +#, no-wrap +msgid "B<--dep14tag>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:937 +msgid "" +"Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " +"B<archive/debian/>I<version>) where possible. This is the default." +msgstr "" + +#. type: TP +#: ../dgit.1:937 +#, no-wrap +msgid "B<--no-dep14tag>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:943 +msgid "" +"Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " +"where only the old tag format is supported, the dgit tag will have the " +"DEP-14 name. This option does not prevent that.)" +msgstr "" + +#. type: TP +#: ../dgit.1:943 +#, no-wrap +msgid "B<--dep14tag-always>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:948 +msgid "" +"Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " +"not support that, dgit push will fail." +msgstr "" + +#. type: TP +#: ../dgit.1:948 +#, no-wrap +msgid "B<-D>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:952 +msgid "" +"Prints debugging information to stderr. Repeating the option produces more " +"output (currently, up to -DDDD is meaningfully different)." +msgstr "" + +#. type: TP +#: ../dgit.1:952 +#, no-wrap +msgid "B<-c>I<name>B<=>I<value>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:956 +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:956 +#, no-wrap +msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:965 +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 " +"in the built changes file, and hence in the upload. If this option is not " +"specified, dgit will query the archive and use the latest version uploaded " +"to the intended suite." +msgstr "" + +#. type: Plain text +#: ../dgit.1:971 +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 " +"be used for the build and upload)." +msgstr "" + +#. type: TP +#: ../dgit.1:971 +#, no-wrap +msgid "B<-m>I<maintaineraddress>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:974 +msgid "Passed to dpkg-genchanges (eventually)." +msgstr "" + +#. type: TP +#: ../dgit.1:974 +#, no-wrap +msgid "B<--ch:>I<option>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:978 +msgid "" +"Specifies a single additional option to pass, eventually, to dpkg-genchanges." +msgstr "" + +#. type: Plain text +#: ../dgit.1:985 +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 " +"automatically calculates whether .origs need to be uploaded.)" +msgstr "" + +#. type: Plain text +#: ../dgit.1:987 +msgid "For other options the caveat below applies." +msgstr "" + +#. type: TP +#: ../dgit.1:987 +#, no-wrap +msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1009 +msgid "" +"Specifies a single additional option to pass to B<curl>, B<dput>, " +"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " +"B<sbuild>, B<pbuilder>, B<cowbuilder>, B<ssh>, B<dgit>, B<git-debrebase>, " +"B<apt-get>, B<apt-cache>, B<gbp-pq>, B<gbp-build>, or B<mergechanges>. Can " +"be repeated as necessary." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1017 +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, " +"you may violate dgit's assumptions about the behaviour of its subprograms " +"and cause lossage." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1022 +msgid "" +"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " +"applies only when the program is invoked directly by dgit. Usually, for " +"passing options to dpkg-genchanges, you should use B<--ch:>I<option>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1026 +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 " +"program run by dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1028 +msgid "See notes below regarding ssh and dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1036 +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:1036 +#, no-wrap +msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1059 +msgid "" +"Specifies alternative programs to use instead of B<curl>, B<dput>, " +"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " +"B<sbuild>, B<pbuilder>, B<cowbuilder>, B<gpg>, B<ssh>, B<dgit>, B<git-" +"debrebase>, B<apt-get>, B<apt-cache>, B<git>, B<gbp-pq>, B<gbp-build>, or " +"B<mergechanges>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1067 +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:1074 +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 " +"EDITOR for dpkg-source --commit; this is done using argv[0], and is not " +"affected by --dgit=)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1085 +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 " +"is used instead of gbp pq. In both cases, unusually, the specified value is " +"split on whitespace to produce a command and possibly some options and/or " +"arguments." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1093 +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 " +"value is split on whitespace." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1110 +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 " +"archive and dgit-repos, this command line setting is overridden by the git " +"config variables B<dgit-distro.>I<distro>B<.ssh> and B<.dgit.default.ssh> " +"(which can in turn be overridden with -c). Also, when dgit is using git to " +"access dgit-repos, only git's idea of what ssh to use (eg, B<GIT_SSH>) is " +"relevant." +msgstr "" + +#. type: TP +#: ../dgit.1:1110 +#, no-wrap +msgid "B<--existing-package=>I<package>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1120 +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 " +"package. Without --new we can just use the package we are trying to push. " +"But with --new that will not work, so we guess B<dpkg> or use the value of " +"this option. This option is not needed with the default mechanisms for " +"accessing the archive." +msgstr "" + +#. type: TP +#: ../dgit.1:1120 +#, no-wrap +msgid "B<-h>|B<--help>" +msgstr "" + +#. type: TP +#: ../dgit.1:1123 +#, no-wrap +msgid "B<--initiator-tempdir=>I<directory>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1132 +msgid "" +"dgit rpush uses a temporary directory on the invoking (signing) host. This " +"option causes dgit to use I<directory> instead. Furthermore, the specified " +"directory will be emptied, removed and recreated before dgit starts, rather " +"than removed after dgit finishes. The directory specified must be an " +"absolute pathname." +msgstr "" + +#. type: TP +#: ../dgit.1:1132 +#, no-wrap +msgid "B<--force->I<something>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1140 +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 " +"are provided as an escape hatch, in case dgit is confused. (They might also " +"be useful for testing error cases.)" +msgstr "" + +#. type: TP +#: ../dgit.1:1140 +#, no-wrap +msgid "B<--force-import-dsc-with-dgit-field>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1147 +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 " +"pushed that .dsc was working with." +msgstr "" + +#. type: TP +#: ../dgit.1:1147 +#, no-wrap +msgid "B<--force-uploading-binaries>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1152 +msgid "" +"Carry on and upload binaries even though dgit thinks your distro does not " +"permit that." +msgstr "" + +#. type: TP +#: ../dgit.1:1152 +#, no-wrap +msgid "B<--force-uploading-source-only>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1158 +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 " +"situation." +msgstr "" + +#. type: TP +#: ../dgit.1:1158 +#, no-wrap +msgid "B<--force-unrepresentable>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1165 +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 " +"build or push will probably fail later." +msgstr "" + +#. type: TP +#: ../dgit.1:1165 +#, no-wrap +msgid "B<--force-changes-origs-exactly>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1170 +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:1170 +#, no-wrap +msgid "B<--force-unsupported-source-format>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1174 +msgid "" +"Carry on despite dgit not understanding your source package format. dgit " +"will probably mishandle it." +msgstr "" + +#. type: TP +#: ../dgit.1:1174 +#, no-wrap +msgid "B<--force-dsc-changes-mismatch>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1178 +msgid "" +"Do not check whether .dsc and .changes match. The archive will probably " +"reject your upload." +msgstr "" + +#. type: TP +#: ../dgit.1:1178 +#, no-wrap +msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1184 +msgid "" +"Force on or off the use of the absurd git-apply emulation when running gbp " +"pq import when importing a package from a .dsc. See Debian bug #841867." +msgstr "" + +#. type: =head1 +#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150 +#, no-wrap +msgid "CONFIGURATION" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1190 +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<-" +"c>I<key>B<=>I<value> on the dgit command line." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1192 +msgid "Settings likely to be useful for an end user include:" +msgstr "" + +#. type: TP +#: ../dgit.1:1192 +#, no-wrap +msgid "B<dgit.default.build-products-dir>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1198 +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:1198 ../dgit-downstream-dsc.7.pod:286 +#, no-wrap +msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1203 +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 " +"involved. The config used is thereafter that for the distro." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1206 +msgid "I<suite> may be a glob pattern." +msgstr "" + +#. type: TP +#: ../dgit.1:1206 +#, no-wrap +msgid "B<dgit.default.distro>I< distro>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1209 +msgid "The default distro for an unknown suite." +msgstr "" + +#. type: TP +#: ../dgit.1:1209 +#, no-wrap +msgid "B<dgit.default.default-suite>I< suite>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1212 +msgid "The default suite (eg for clone)." +msgstr "" + +#. type: TP +#: ../dgit.1:1212 +#, no-wrap +msgid "B<dgit.default.>*" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1217 +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:1217 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.clean-mode>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1221 +msgid "" +"One of the values for the command line --clean= option; used if --clean is " +"not specified." +msgstr "" + +#. type: TP +#: ../dgit.1:1221 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1225 +msgid "" +"One of the values for the command line --quilt= option; used if --quilt is " +"not specified." +msgstr "" + +#. type: TP +#: ../dgit.1:1225 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1229 +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:1229 +#, 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:1236 +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, " +"setting this to false will avoid relying on the mirror of the dgit git " +"repository server." +msgstr "" + +#. type: TP +#: ../dgit.1:1236 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.keyid>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1240 +msgid "See also B<-k>." +msgstr "" + +#. type: TP +#: ../dgit.1:1240 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" +msgstr "" + +#. type: TP +#: ../dgit.1:1242 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.username>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1245 +msgid "Not relevant for Debian." +msgstr "" + +#. type: =item +#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.upload-host>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1248 +msgid "Might be useful if you have an intermediate queue server." +msgstr "" + +#. type: TP +#: ../dgit.1:1248 +#, 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:1253 +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, " +"respectively. Only used if .setup-usermail is not disabled." +msgstr "" + +#. type: TP +#: ../dgit.1:1253 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1257 +msgid "" +"Whether to set user.name and user.email in new git trees. True by default. " +"Ignored for dgit setup-setup-useremail, which does it anyway." +msgstr "" + +#. type: TP +#: ../dgit.1:1257 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1262 +msgid "" +"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" +"changelog. True by default. Ignored for dgit setup-mergechangelogs, which " +"does it anyway." +msgstr "" + +#. type: TP +#: ../dgit.1:1262 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1268 +msgid "" +"Whether to configure .git/info/attributes to suppress checkin/checkout file " +"content transformations in new git trees. True by default. Ignored for " +"dgit setup-gitattributes, which does it anyway." +msgstr "" + +#. type: TP +#: ../dgit.1:1268 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1274 +msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." +msgstr "" + +#. type: TP +#: ../dgit.1:1274 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1285 +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 --" +"add). The options for B<dgit.default.opts->I<cmd> B<dgit-distro." +">I<distro>B</push.opts->I<cmd> and are all used, followed by options from " +"dgit's command line." +msgstr "" + +#. type: SH +#: ../dgit.1:1285 +#, no-wrap +msgid "ACCESS CONFIGURATION" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1290 +msgid "" +"There are many other settings which specify how a particular distro's " +"services (archive and git) are provided. These should not normally be " +"adjusted, but are documented for the benefit of distros who wish to adopt " +"dgit." +msgstr "" + +#. type: TP +#: ../dgit.1:1290 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1293 +msgid "Shown in git tags, Dgit fields, and so on." +msgstr "" + +#. type: TP +#: ../dgit.1:1293 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.alias-canon>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1296 +msgid "Used for all access configuration lookup." +msgstr "" + +#. type: TP +#: ../dgit.1:1296 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B</push.>*" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1302 +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:1302 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-url>" +msgstr "" + +#. type: TP +#: ../dgit.1:1304 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" +msgstr "" + +#. type: TP +#: ../dgit.1:1306 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-proto>" +msgstr "" + +#. type: TP +#: ../dgit.1:1308 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-path>" +msgstr "" + +#. type: TP +#: ../dgit.1:1310 +#, 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:1312 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" +msgstr "" + +#. type: TP +#: ../dgit.1:1314 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" +msgstr "" + +#. type: TP +#: ../dgit.1:1316 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" +msgstr "" + +#. type: TP +#: ../dgit.1:1318 +#, 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>" +msgstr "" + +#. type: TP +#: ../dgit.1:1320 +#, 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:1322 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.madison-distro>" +msgstr "" + +#. type: TP +#: ../dgit.1:1324 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" +msgstr "" + +#. type: TP +#: ../dgit.1:1326 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" +msgstr "" + +#. type: TP +#: ../dgit.1:1328 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" +msgstr "" + +#. type: TP +#: ../dgit.1:1330 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.ssh>" +msgstr "" + +#. type: TP +#: ../dgit.1:1332 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" +msgstr "" + +#. type: TP +#: ../dgit.1:1334 +#, 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:1336 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" +msgstr "" + +#. type: TP +#: ../dgit.1:1338 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" +msgstr "" + +#. type: TP +#: ../dgit.1:1340 +#, 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:1342 +#, no-wrap +msgid "B<dgit.default.old-dsc-distro>" +msgstr "" + +#. type: TP +#: ../dgit.1:1344 +#, no-wrap +msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" +msgstr "" + +#. type: TP +#: ../dgit.1:1346 +#, no-wrap +msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" +msgstr "" + +#. type: TP +#: ../dgit.1:1348 +#, no-wrap +msgid "B<dgit.default.dsc-url-proto-ok>" +msgstr "" + +#. type: TP +#: ../dgit.1:1350 +#, no-wrap +msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" +msgstr "" + +#. type: SH +#: ../dgit.1:1352 +#, no-wrap +msgid "ENVIRONMENT VARIABLES" +msgstr "" + +#. type: TP +#: ../dgit.1:1353 +#, no-wrap +msgid "B<DGIT_SSH>, B<GIT_SSH>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1362 +msgid "" +"specify an alternative default program (and perhaps arguments) to use " +"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " +"it contains any whitespace will be passed to the shell. GIT_SSH specifies " +"just the program; no arguments can be specified, so dgit interprets it the " +"same way as git does. See also the --ssh= and --ssh: options." +msgstr "" + +#. type: TP +#: ../dgit.1:1362 +#, no-wrap +msgid "B<DEBEMAIL>, B<DEBFULLNAME>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1366 +msgid "" +"Default git user.email and user.name for new trees. See B<dgit setup-new-" +"tree>." +msgstr "" + +#. type: TP +#: ../dgit.1:1366 +#, no-wrap +msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1371 +msgid "" +"and other subprograms and modules used by dgit are affected by various " +"environment variables. Consult the documentaton for those programs for " +"details." +msgstr "" + +#. type: SH +#: ../dgit.1:1371 +#, no-wrap +msgid "BUGS" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1378 +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 " +"stack. It might have to leave a note for a future dgit push." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1384 +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 " +"available before starting work." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1389 +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 " +"format. This is ultimately due to what I consider design problems in quilt " +"and dpkg-source." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1394 +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-" +"run dgit fetch first will help. --damp-run is likely to work much better." +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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1403 +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:1404 +msgid "https://browse.dgit.debian.org/" +msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot new file mode 100644 index 0000000..cd5145e --- /dev/null +++ b/po4a/dgit_7.pot @@ -0,0 +1,874 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: TH +#: ../dgit.1:2 ../dgit.7:1 +#, no-wrap +msgid "dgit" +msgstr "" + +#. type: TH +#: ../dgit.1:2 ../dgit.7:1 +#, no-wrap +msgid "Debian Project" +msgstr "" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: Plain text +#: ../dgit.7:4 +msgid "dgit - principles of operation" +msgstr "" + +#. type: =head1 +#: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35 +#, no-wrap +msgid "SUMMARY" +msgstr "" + +#. type: Plain text +#: ../dgit.7:14 +msgid "" +"B<dgit> treats the Debian archive as a version control system, and " +"bidirectionally gateways between the archive and git. The git view of the " +"package can contain the usual upstream git history, and will be augmented by " +"commits representing uploads done by other developers not using dgit. This " +"git history is stored in a canonical location known as B<dgit-repos> which " +"lives on a dedicated git server." +msgstr "" + +#. type: Plain text +#: ../dgit.7:23 +msgid "" +"git branches suitable for use with dgit can be edited directly in git, and " +"used directly for building binary packages. They can be shared using all " +"conventional means for sharing git branches. It is not necessary to use " +"dgit to work with dgitish git branches. However, dgit is (usually) needed " +"in order to convert to or from Debian-format source packages." +msgstr "" + +#. type: TP +#: ../dgit.7:24 +#, no-wrap +msgid "B<dgit>(1)" +msgstr "" + +#. type: Plain text +#: ../dgit.7:27 +msgid "Reference manual and documentation catalogue." +msgstr "" + +#. type: TP +#: ../dgit.7:27 +#, no-wrap +msgid "B<dgit-*(7)>" +msgstr "" + +#. type: Plain text +#: ../dgit.7:30 +msgid "Tutorials and workflow guides. See dgit(1) for a list." +msgstr "" + +#. type: SH +#: ../dgit.7:30 +#, no-wrap +msgid "MODEL" +msgstr "" + +#. type: Plain text +#: ../dgit.7:33 +msgid "" +"You may use any suitable git workflow with dgit, provided you satisfy dgit's " +"requirements:" +msgstr "" + +#. type: Plain text +#: ../dgit.7:38 +msgid "" +"dgit maintains a pseudo-remote called B<dgit>, with one branch per suite. " +"This remote cannot be used with plain git." +msgstr "" + +#. type: Plain text +#: ../dgit.7:45 +msgid "" +"The B<dgit-repos> repository for each package contains one ref per suite " +"named B<refs/dgit/>I<suite>. These should be pushed to only by dgit. They " +"are fast forwarding. Each push on this branch corresponds to an upload (or " +"attempted upload)." +msgstr "" + +#. type: Plain text +#: ../dgit.7:49 +msgid "" +"However, it is perfectly fine to have other branches in dgit-repos; normally " +"the dgit-repos repo for the package will be accessible via the remote name " +"`origin'." +msgstr "" + +#. type: Plain text +#: ../dgit.7:55 +msgid "" +"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 "" + +#. type: Plain text +#: ../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 " +"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 " +"git server for that distro." +msgstr "" + +#. type: Plain text +#: ../dgit.7:77 +msgid "" +"Uploads not made by dgit are represented in git by commits which are " +"synthesised by dgit. The tree of each such commit corresponds to the " +"unpacked source; there is a commit with the contents, and a pseudo-merge " +"from last known upload - that is, from the contents of the dgit/suite " +"branch. Depending on the source package format, the contents commit may " +"have a more complex structure, but ultimately it will be a convergence of " +"stubby branches from origin commits representing the components of the " +"source package." +msgstr "" + +#. type: Plain text +#: ../dgit.7:82 +msgid "" +"dgit expects trees that it works with to have a B<dgit> (pseudo) remote. " +"This refers to the dgit-created git view of the corresponding archive." +msgstr "" + +#. type: Plain text +#: ../dgit.7:91 +msgid "" +"The dgit archive tracking view is synthesised locally, on demand, by each " +"copy of dgit. The tracking view is always a descendant of the dgit-repos " +"suite branch (if one exists), but may be ahead of it if uploads have been " +"done without dgit. The archive tracking view is always fast forwarding " +"within each suite." +msgstr "" + +#. type: Plain text +#: ../dgit.7:94 +msgid "" +"dgit push can operate on any commit which is a descendant of the suite " +"tracking branch." +msgstr "" + +#. type: Plain text +#: ../dgit.7:105 +msgid "" +"dgit does not make a systematic record of its imports of orig tarball(s). " +"So it does not work by finding git tags or branches referring to orig " +"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.)" +msgstr "" + +#. type: Plain text +#: ../dgit.7:112 +msgid "" +"dgit repositories could be cloned with standard (git) methods. However, the " +"dgit repositories do not contain uploads not made with dgit. And for " +"sourceful builds / uploads the orig tarball(s) will need to be present in " +"the parent directory." +msgstr "" + +#. type: Plain text +#: ../dgit.7:119 +msgid "" +"To a user looking at the archive, changes pushed in a simple NMU using dgit " +"look like reasonable changes made in an NMU: in a `3.0 (quilt)' package the " +"delta from the previous upload is recorded in new patch(es) constructed by " +"dpkg-source." +msgstr "" + +#. type: SH +#: ../dgit.7:119 +#, no-wrap +msgid "COMBINED SUITES" +msgstr "" + +#. type: Plain text +#: ../dgit.7:124 +msgid "" +"dgit can synthesize a combined view of several underlying suites. This is " +"requested by specifying, for I<suite,> a comma-separated list:" +msgstr "" + +#. type: Plain text +#: ../dgit.7:126 +msgid "I<mainsuite>B<,>I<subsuite>..." +msgstr "" + +#. type: Plain text +#: ../dgit.7:128 +msgid "This facility is available with dgit clone, fetch and pull, only." +msgstr "" + +#. type: Plain text +#: ../dgit.7:138 +msgid "" +"dgit will fetch the same package from each specified underlying suite, " +"separately (as if with dgit fetch). dgit will then generate a pseudomerge " +"commit on the tracking branch B<remotes/dgit/dgit/>I<suite> which has the " +"tip of each of the underlying suites as an ancestor, and which contains the " +"same as the suite which has the highest version of the package." +msgstr "" + +#. type: Plain text +#: ../dgit.7:141 +msgid "" +"The package must exist in mainsuite, but need not exist in the subsuites." +msgstr "" + +#. type: Plain text +#: ../dgit.7:145 +msgid "If a specified subsuite starts with B<-> then mainsuite is prepended." +msgstr "" + +#. type: Plain text +#: ../dgit.7:153 +msgid "" +"So, for example, B<stable,-security> means to look for the package in " +"stable, and stable-security, taking whichever is newer. If stable is " +"currently jessie, dgit clone would leave you on the branch B<dgit/jessie,-" +"security>." +msgstr "" + +#. type: Plain text +#: ../dgit.7:161 +msgid "" +"Combined suites are not supported by the dgit build operations. This is " +"because those options are intended for building for uploading source " +"packages, and look in the changelog to find the relevant suite. It does not " +"make sense to name a dgit-synthesised combined suite in a changelog, or to " +"try to upload to it." +msgstr "" + +#. type: Plain text +#: ../dgit.7:166 +msgid "" +"When using this facility, it is important to always specify the same suites " +"in the same order: dgit will not be make a coherent fast-forwarding history " +"view otherwise." +msgstr "" + +#. type: Plain text +#: ../dgit.7:170 +msgid "" +"The history generated by this feature is not normally suitable for merging " +"back into upstreams, as it necessarily contains unattractive pseudomerges." +msgstr "" + +#. type: SH +#: ../dgit.7:170 +#, no-wrap +msgid "LIMITATIONS" +msgstr "" + +#. type: Plain text +#: ../dgit.7:183 +msgid "" +"Because the synthesis of the suite tracking branches is done locally based " +"only on the current archive state, it will not necessarily see every upload " +"not done with dgit. Also, different versions of dgit (or the software it " +"calls) might import the same .dscs differently (although we try to minimise " +"this). As a consequence, the dgit tracking views of the same suite, made by " +"different instances of dgit, may vary. They will have the same contents, " +"but may have different history." +msgstr "" + +#. type: Plain text +#: ../dgit.7:192 +msgid "" +"There is no uniform linkage between the tracking branches for different " +"suites. The Debian infrastructure does not do any automatic import of " +"uploads made without dgit. It would be possible for a distro's " +"infrastructure to do this; in that case, different dgit client instances " +"would see exactly the same history." +msgstr "" + +#. type: Plain text +#: ../dgit.7:200 +msgid "" +"There has been no bulk import of historical uploads into Debian's dgit " +"infrastructure. To do this it would be necessary to decide whether to " +"import existing vcs history (which might not be faithful to dgit's " +"invariants) or previous non-Dgit uploads (which would not provide a very " +"rich history)." +msgstr "" + +#. type: Plain text +#: ../dgit.7:211 +msgid "" +"git represents only file executability. git does not represent empty " +"directories, or any leaf objects other than plain files and symlinks. The " +"behaviour of Debian source package formats on objects with unusual " +"permissions is complicated. Some pathological Debian source packages will " +"no longer build if empty directories are pruned (or if other things not " +"reproduced by git are changed). Such sources cannot be worked with properly " +"in git, and therefore not with dgit either." +msgstr "" + +#. type: SH +#: ../dgit.7:211 +#, no-wrap +msgid "READ-ONLY DISTROS" +msgstr "" + +#. type: Plain text +#: ../dgit.7:215 +msgid "" +"Distros which do not maintain a set of dgit history git repositories can " +"still be used in a read-only mode with dgit. Currently Ubuntu is configured " +"this way." +msgstr "" + +#. type: SH +#: ../dgit.7:215 +#, no-wrap +msgid "GITATTRIBUTES" +msgstr "" + +#. type: Plain text +#: ../dgit.7:223 +msgid "" +"git has features which can automatically transform files as they are being " +"copied between the working tree and the git history. The attributes can be " +"specified in the source tree itself, in B<.gitattributes>. See " +"B<gitattributes>(5)." +msgstr "" + +#. type: Plain text +#: ../dgit.7:232 +msgid "" +"These transformations are context-sensitive and not, in general, reversible, " +"so dgit operates on the principle that the dgit git history contains the " +"actual contents of the package. (When dgit is manipulating a .dsc, it does " +"so in a private area, where the transforming gitattributes are defused, to " +"achieve this.)" +msgstr "" + +#. type: Plain text +#: ../dgit.7:241 +msgid "" +"If transforming gitattributes are used, they can cause trouble, because the " +"working tree files can differ from the git revision history (and therefore " +"from the source packages). dgit warns if it finds a .gitattributes file (in " +"a package being fetched or imported), unless the transforming gitattributes " +"have been defused." +msgstr "" + +#. type: Plain text +#: ../dgit.7:252 +msgid "" +"dgit clone and dgit setup-new-tree disable transforming gitattributes by " +"default, by creating a suitable .git/info/attributes. See B<dgit setup-new-" +"tree> and B<dgit setup-gitattributes> in dgit(1)." +msgstr "" + +#. type: Plain text +#: ../dgit.7:262 +msgid "" +"Note that dgit does not disable gitattributes unless they would actually " +"interfere with your work on dgit branches. In particular, gitattributes " +"which affect B<git archive> are not disabled, so .origs you generate by hand " +"can be wrong. You should consider using B<git-deborig (1)> which gets this " +"right, suppressing the attributes." +msgstr "" + +#. type: SH +#: ../dgit.7:262 +#, no-wrap +msgid "PACKAGE SOURCE FORMATS" +msgstr "" + +#. type: Plain text +#: ../dgit.7:267 +msgid "" +"If you are not the maintainer, you do not need to worry about the source " +"format of the package. You can just make changes as you like in git. If " +"the package is a `3.0 (quilt)' package, the patch stack will usually not be " +"represented in the git history." +msgstr "" + +#. type: SH +#: ../dgit.7:267 +#, no-wrap +msgid "FILE EXECUTABILITY" +msgstr "" + +#. type: Plain text +#: ../dgit.7:274 +msgid "" +"Debian source package formats do not always faithfully reproduce changes to " +"executability. But dgit insists that the result of dgit clone is identical " +"(as far as git can represent - see Limitations, above) to the result of " +"dpkg-source -x." +msgstr "" + +#. type: Plain text +#: ../dgit.7:280 +msgid "" +"So files that are executable in your git tree must be executable in the " +"result of dpkg-source -x (but often aren't). If a package has such " +"troublesome files, they have to be non-executable in dgit-compatible git " +"branches." +msgstr "" + +#. type: SH +#: ../dgit.7:280 +#, no-wrap +msgid "FORMAT 3.0 (QUILT)" +msgstr "" + +#. type: Plain text +#: ../dgit.7:284 +msgid "" +"For a format `3.0 (quilt)' source package, dgit may have to make a commit on " +"your current branch to contain metadata used by quilt and dpkg-source." +msgstr "" + +#. type: Plain text +#: ../dgit.7:291 +msgid "" +"This is because `3.0 (quilt)' source format represents the patch stack as " +"files in debian/patches/ actually inside the source tree. This means that, " +"taking the whole tree (as seen by git or ls) (i) dpkg-source cannot " +"represent certain trees, and (ii) packing up a tree in `3.0 (quilt)' and " +"then unpacking it does not always yield the same tree." +msgstr "" + +#. type: Plain text +#: ../dgit.7:296 +msgid "" +"dgit will automatically work around this for you when building and pushing. " +"The only thing you need to know is that dgit build, sbuild, etc., may make " +"new commits on your HEAD. If you're not a quilt user this commit won't " +"contain any changes to files you care about." +msgstr "" + +#. type: Plain text +#: ../dgit.7:303 +msgid "" +"Simply commiting to source files (whether in debian/ or not, but not to " +"patches) will result in a branch that dgit quilt-fixup can linearise. " +"Other kinds of changes, including editing patches or merging, cannot be " +"handled this way." +msgstr "" + +#. type: Plain text +#: ../dgit.7:306 +msgid "" +"You can explicitly request that dgit do just this fixup, by running dgit " +"quilt-fixup." +msgstr "" + +#. type: Plain text +#: ../dgit.7:313 +msgid "" +"If you are a quilt user you need to know that dgit's git trees are `patches " +"applied packaging branches' and do not contain the .pc directory (which is " +"used by quilt to record which patches are applied). If you want to " +"manipulate the patch stack you probably want to be looking at tools like git-" +"debrebase, gbp pq, or git-dpm." +msgstr "" + +#. type: SS +#: ../dgit.7:314 +#, no-wrap +msgid "quilt fixup error messages" +msgstr "" + +#. type: Plain text +#: ../dgit.7:316 +msgid "When dgit's quilt fixup fails, it prints messages like this:" +msgstr "" + +#. type: Plain text +#: ../dgit.7:322 +#, no-wrap +msgid "" +"dgit: base trees orig=5531f03d8456b702eab6 o+d/p=135338e9cc253cc85f84\n" +"dgit: quilt differences: src: == orig ## gitignores: == orig ##\n" +"dgit: quilt differences: HEAD ## o+d/p HEAD ## o+d/p\n" +"starting quiltify (multiple patches, linear mode)\n" +msgstr "" + +#. type: Plain text +#: ../dgit.7:325 +#, no-wrap +msgid "" +"dgit: error: quilt fixup cannot be linear. Stopped at:\n" +"dgit: 696c9bd5..84ae8f96: changed debian/patches/test-gitignore\n" +msgstr "" + +#. type: TP +#: ../dgit.7:327 +#, no-wrap +msgid "B<orig>" +msgstr "" + +#. type: Plain text +#: ../dgit.7:333 +msgid "" +"is an import of the .orig tarballs dgit found, with the debian/ directory " +"from your HEAD substituted. This is a git tree object, not a commit: you " +"can pass its hash to git-diff but not git-log." +msgstr "" + +#. type: TP +#: ../dgit.7:334 +#, no-wrap +msgid "B<o+d/p>" +msgstr "" + +#. type: Plain text +#: ../dgit.7:339 +msgid "" +"is another tree object, which is the same as orig but with the patches from " +"debian/patches applied." +msgstr "" + +#. type: TP +#: ../dgit.7:340 +#, no-wrap +msgid "B<HEAD>" +msgstr "" + +#. type: Plain text +#: ../dgit.7:343 +msgid "is of course your own git HEAD." +msgstr "" + +#. type: TP +#: ../dgit.7:344 +#, no-wrap +msgid "B<quilt differences>" +msgstr "" + +#. type: Plain text +#: ../dgit.7:353 +msgid "" +"shows whether each of the these trees differs from the others (i) in " +"upstream files excluding .gitignore files; (ii) in upstream .gitignore " +"files. B<==> indicates equality; B<##> indicates inequality." +msgstr "" + +#. type: Plain text +#: ../dgit.7:360 +msgid "" +"dgit quilt-fixup --quilt=linear walks commits backwards from your HEAD " +"trying to construct a linear set of additional patches, starting at the " +"end. It hopes to eventually find an ancestor whose tree is identical to o+d/" +"p in all upstream files." +msgstr "" + +#. type: Plain text +#: ../dgit.7:371 +msgid "" +"In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " +"edge which cannot be sensibly be either ignored, or turned into a patch in " +"debian/patches. In this example, this is because it itself changes files in " +"debian/patches, indicating that something unusual is going on and that " +"continuing is not safe. But you might also see other kinds of troublesome " +"commit or edge." +msgstr "" + +#. type: Plain text +#: ../dgit.7:390 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.7:396 +msgid "" +"Finally, this problem can occur if you have provided Debian git tooling such " +"as git-debrebase, git-dpm or git-buildpackage with upstream git commit(s) or " +"tag(s) which are not 100% identical to your orig tarball(s)." +msgstr "" + +#. type: SH +#: ../dgit.7:396 +#, no-wrap +msgid "SPLIT VIEW QUILT MODE" +msgstr "" + +#. type: Plain text +#: ../dgit.7:403 +msgid "" +"When working with git branches intended for use with the `3.0 (quilt)' " +"source format dgit can automatically convert a suitable maintainer-provided " +"git branch (in one of a variety of formats) into a dgit branch." +msgstr "" + +#. type: Plain text +#: ../dgit.7:410 +msgid "" +"When a split view mode is engaged dgit build commands and dgit push will, on " +"each invocation, convert the user's HEAD into the dgit view, so that it can " +"be built and/or uploaded." +msgstr "" + +#. type: Plain text +#: ../dgit.7:417 +msgid "" +"dgit push in split view mode will push the dgit view to the dgit git " +"server. The dgit view is always a descendant of the maintainer view. dgit " +"push will also make a maintainer view tag according to DEP-14 and push that " +"to the dgit git server." +msgstr "" + +#. type: Plain text +#: ../dgit.7:425 +msgid "" +"Split view mode must be enabled explicitly (by the use of the applicable " +"command line options, subcommands, or configuration). This is because it is " +"not possible to reliably tell (for example) whether a git tree for a dpkg-" +"source `3.0 (quilt)' package is a patches-applied or patches-unapplied tree." +msgstr "" + +#. type: Plain text +#: ../dgit.7:429 +msgid "" +"Split view conversions are cached in the ref dgit-intern/quilt-cache. This " +"should not be manipulated directly." +msgstr "" + +#. type: SH +#: ../dgit.7:429 +#, no-wrap +msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC." +msgstr "" + +#. type: Plain text +#: ../dgit.7:432 +msgid "" +"This section is mainly of interest to maintainers who want to use dgit with " +"their existing git history for the Debian package." +msgstr "" + +#. type: Plain text +#: ../dgit.7:438 +msgid "" +"Some developers like to have an extra-clean git tree which lacks files which " +"are normally found in source tarballs and therefore in Debian source " +"packages. For example, it is conventional to ship ./configure in the source " +"tarball, but some people prefer not to have it present in the git view of " +"their project." +msgstr "" + +#. type: Plain text +#: ../dgit.7:443 +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." +msgstr "" + +#. type: Plain text +#: ../dgit.7:445 +msgid "As the maintainer you therefore have the following options:" +msgstr "" + +#. type: TP +#: ../dgit.7:445 ../dgit.7:456 ../dgit.7:505 ../dgit.7:513 +#, no-wrap +msgid "\\(bu" +msgstr "" + +#. type: Plain text +#: ../dgit.7:456 +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 " +"means represeting the deletions as patches. You may need to pass --include-" +"removal to dpkg-source --commit, or pass corresponding options to other " +"tools.) This can make the Debian source package less useful for people " +"without Debian build infrastructure." +msgstr "" + +#. type: Plain text +#: ../dgit.7:462 +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 " +"files from the tarball may make the tarball hard for people to use." +msgstr "" + +#. type: Plain text +#: ../dgit.7:468 +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 " +"advantage that someone who clones the git repository finds the program just " +"as easy to build as someone who uses the tarball." +msgstr "" + +#. type: Plain text +#: ../dgit.7:473 +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 " +"notice this and complain. You may have to fix these bugs before you can " +"unify your existing git history with dgit's." +msgstr "" + +#. type: SH +#: ../dgit.7:474 +#, no-wrap +msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC." +msgstr "" + +#. type: Plain text +#: ../dgit.7:478 +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 " +"in Debian we always rebuild." +msgstr "" + +#. type: Plain text +#: ../dgit.7:488 +msgid "" +"Examples sometimes include crossbuild firmware binaries and documentation. " +"To avoid problems when building updated source packages (in particular, to " +"avoid trying to represent as changes in the source package uninteresting or " +"perhaps unrepresentable changes to such files) many maintainers arrange for " +"the package clean target to delete these files." +msgstr "" + +#. type: Plain text +#: ../dgit.7:496 +msgid "" +"dpkg-source does not (with any of the commonly used source formats) " +"represent deletion of binaries (outside debian/) present in upstream. Thus " +"deleting such files in a dpkg-source working tree does not actually result " +"in them being deleted from the source package. Thus deleting the files in " +"rules clean sweeps this problem under the rug." +msgstr "" + +#. type: Plain text +#: ../dgit.7:502 +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 " +"means that a dgit-compatible git tree always contains these files." +msgstr "" + +#. type: Plain text +#: ../dgit.7:505 +msgid "" +"For the non-maintainer, this can be observed in the following suboptimal " +"occurrences:" +msgstr "" + +#. type: Plain text +#: ../dgit.7:513 +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 " +"B<dgit -wg> aka B<--clean=git>, so that the package clean target is never " +"run." +msgstr "" + +#. type: Plain text +#: ../dgit.7:520 +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 " +"build (or at least before each commit or push)." +msgstr "" + +#. type: Plain text +#: ../dgit.7:530 +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. " +"The maintainer has a few additional options for mitigation: for example, it " +"may be possible for the rules file to arrange to do the build in a temporary " +"area, which avoids updating the troublesome files; they can then be left in " +"the git tree without seeing trouble." +msgstr "" + +#. type: SH +#: ../dgit.7:530 +#, no-wrap +msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC." +msgstr "" + +#. type: Plain text +#: ../dgit.7:538 +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 " +"package, or simply forget to remove certain files, dgit will complain that " +"the tree is dirty." +msgstr "" + +#. type: Plain text +#: ../dgit.7:546 +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 " +"with perhaps B<git reset --hard> before each build." +msgstr "" + +#. type: Plain text +#: ../dgit.7:550 +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 " +"be lost." +msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot new file mode 100644 index 0000000..b38a193 --- /dev/null +++ b/po4a/git-debrebase_1.pot @@ -0,0 +1,1024 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: =head1 +#: ../dgit.1:496 ../git-debrebase.1.pod:441 +#, no-wrap +msgid "OPTIONS" +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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:3 +msgid "git-debrebase - delta queue rebase tool for Debian packaging" +msgstr "" + +#. type: =head1 +#: ../git-debrebase.1.pod:5 +msgid "SYNOPSYS" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.1.pod:7 +#, no-wrap +msgid "" +" git-debrebase [<options...>] [-- <git-rebase options...>]\n" +" git-debrebase [<options...>] <operation> [<operation options...>\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 +msgid "" +"git-debrebase is a tool for representing in git, and manpulating, Debian " +"packages based on upstream source code." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:16 +msgid "" +"This is the command line reference. Please read the tutorial L<dgit-maint-" +"debrebase(7)>. For background, theory of operation, and definitions see " +"L<git-debrebase(5)>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:22 +msgid "" +"You should read this manpage in cojnunction with L<git-debrebase(5)/" +"TERMINOLOGY>, which defines many important terms used here." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.1.pod:26 +msgid "PRINCIPAL OPERATIONS" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:30 +msgid "git-debrebase [-- <git-rebase options...>]" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:32 +msgid "git-debrebase [-i <further git-rebase options...>]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:34 +msgid "" +"Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> " +"below.)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:37 +msgid "" +"Then, if any git-rebase options were supplied, edits the Debian delta queue, " +"using git-rebase, by running" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.1.pod:41 +#, no-wrap +msgid "" +" git rebase <git-rebase options> <breakwater-tip>\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:43 +msgid "" +"Do not pass a base branch argument: git-debrebase will supply that. Do not " +"use --onto, or --fork-point. Useful git-rebase options include -i and --" +"autosquash." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:48 +msgid "" +"If git-rebase stops for any reason, you may git-rebase --abort, --continue, " +"or --skip, as usual. If you abort the git-rebase, the branch will still " +"have been laundered, but everything in the rebase will be undone." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:54 +msgid "" +"The options for git-rebase must either start with C<-i>, or be prececded by " +"C<-->, to distinguish them from options for git-debrebase." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:58 +msgid "" +"It is hazardous to use plain git-rebase on a git-debrebase branch, because " +"git-rebase has a tendency to start the rebase too far back in history, and " +"then drop important commits. Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:64 +msgid "git-debrebase status" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:66 +msgid "" +"Analyses the current branch, both in terms of its contents, and the refs " +"which are relevant to git-debrebase, and prints a human-readable summary." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:71 +msgid "" +"Please do not attempt to parse the output; it may be reformatted or " +"reorganised in the future. Instead, use one of the L<UNDERLYING AND " +"SUPPLEMENTARY OPERATIONS> described below." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:77 +msgid "git-debrebase conclude" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:79 +msgid "" +"Finishes a git-debrebase session, tidying up the branch and making it fast " +"forward again." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:82 +msgid "" +"Specifically: if the branch is unstitched, launders and restitches it, " +"making a new pseudomerge. Otherwise, it is an error, unless --noop-ok." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:88 +msgid "git-debrebase quick" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:90 +msgid "" +"Unconditionally launders and restitches the branch, consuming any ffq-prev " +"and making a new pseudomerge." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:94 +msgid "If the branch is already laundered and stitched, does nothing." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:96 +msgid "git-debrebase prepush [--prose=<for commit message>]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:98 +msgid "If the branch is unstitched, stitches it, consuming ffq-prev." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:102 +msgid "" +"This is a good command to run before pushing to a git server. You should " +"consider using B<conclude> instead, because that launders the branch too." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:106 +msgid "git-debrebase stitch [--prose=<for commit message>]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:108 +msgid "Stitches the branch, consuming ffq-prev." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:111 +msgid "If there is no ffq-prev, it is an error, unless --noop-ok." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:113 +msgid "You should consider using B<prepush> or B<conclude> instead." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:115 +msgid "git-debrebase scrap" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:117 +msgid "" +"Throws away all the work since the branch was last stitched. This is done " +"by rewinding you to ffq-prev." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:120 +msgid "If you are in the middle of a git-rebase, will abort that too." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:122 +msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:124 +msgid "Rebases the delta queue onto a new upstream version. In detail:" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:127 +msgid "" +"Firstly, checks that the proposed rebase seems to make sense: It is a snag " +"unless the new upstream(s) are fast forward from the previous upstream(s) " +"as found in the current breakwater anchor. And, in the case of a multi-" +"piece upstream (a multi-component upstream, in dpkg-source terminology), if " +"the pieces are not in the same order, with the same names." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:135 +msgid "If all seems well, unstitches and launders the branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:137 +msgid "" +"Then, generates (in a private working area) a new anchor merge commit, on " +"top of the breakwater tip, and on top of that a commit to update the version " +"number in debian/changelog." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:145 +msgid "Finally, starts a git-rebase of the delta queue onto these new commits." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:149 +msgid "" +"That git-rebase may complete successfully, or it may require your " +"assistance, just like a normal git-rebase." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:153 +msgid "" +"If you git-rebase --abort, the whole new upstream operation is aborted, " +"except for the laundering." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:157 +msgid "" +"<new-version> may be whole new Debian version, including revision, or just " +"the upstream part, in which case -1 will be appended to make the new Debian " +"version." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:163 +msgid "The <upstream-details> are, optionally, in order:" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:167 +msgid "<upstream-commit-ish>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:169 +msgid "" +"The new upstream branch (or commit-ish). The default is to look for one of " +"these tags, in this order: U vU upstream/U; where U is the new upstream " +"version. (This is the same algorithm as L<git-deborig(1)>.)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:175 +msgid "" +"It is a snag if the upstream contains a debian/ directory; if forced to " +"proceed, git-debrebase will disregard the upstream's debian/ and take (only) " +"the packaging from the current breakwater." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:180 +msgid "<piece-name> <piece-upstream-commit-ish>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:182 +msgid "Specifies that this is a multi-piece upstream. May be repeated." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:185 +msgid "" +"When such a pair is specified, git-debrebase will first combine the pieces " +"of the upstream together, and then use the result as the combined new " +"upstream." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:190 +msgid "" +"For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes " +"the subdirectory <piece-name> in the combined new upstream (supplanting any " +"subdirectory that might be there in the main upstream branch)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:197 +msgid "" +"<piece-name> has a restricted syntax: it may contain only ASCII " +"alphanumerics and hyphens." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:200 +msgid "" +"The combined upstream is itself recorded as a commit, with each of the " +"upstream pieces' commits as parents. The combined commit contains an " +"annotation to allow a future git-debrebase new upstream operation to make " +"the coherency checks described above." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:206 +msgid "<git-rebase options>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:208 +msgid "These will be passed to git rebase." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:210 +msgid "" +"If the upstream rebase is troublesome, -i may be helpful. As with plain git-" +"debrebase, do not specify a base, or --onto, or --fork-point." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:216 +msgid "" +"If you are planning to generate a .dsc, you will also need to have, or " +"generate, actual orig tarball(s), which must be identical to the rev-" +"spec(s) passed to git-debrebase. git-debrebase does not concern itself " +"with source packages so neither helps with this, nor checks it. L<git-" +"deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be " +"able to help." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:227 +msgid "git-debrebase make-patches [--quiet-would-amend]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:229 +msgid "" +"Generate patches in debian/patches/ representing the changes made to " +"upstream files." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:232 +msgid "" +"It is not normally necessary to run this command explicitly. When uploading " +"to Debian, dgit and git-debrebase will cooperate to regenerate patches as " +"necessary. When working with pure git remotes, the patches are not needed." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:239 +msgid "" +"Normally git-debrebase make-patches will require a laundered branch. (A " +"laundered branch does not contain any patches.) But if there are already " +"some patches made by git-debrebase make-patches, and all that has happened " +"is that more changes to upstream files have been committed, running it again " +"can add the missing patches." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:248 +msgid "" +"If the patches implied by the current branch are not a simple superset of " +"those already in debian/patches, make-patches will fail with exit status 7, " +"and an error message. (The message can be suppress with --quiet-would-" +"amend.) If the problem is simply that the existing patches were not made by " +"git-debrebase, using dgit quilt-fixup instead should succeed." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:257 +msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:259 +msgid "" +"Cnnverts a gbp patches-unapplied branch (not a gbp pq patch queue branch) " +"into a git-debrebase interchange branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:263 +msgid "" +"This is done by generating a new anchor merge, converting the quilt patches " +"as a delta queue, and dropping the patches from the tree." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:267 +msgid "" +"The upstream commit-ish should correspond to the gbp upstream branch, if " +"there is one. It is a snag if it is not an ancestor of HEAD, or if the " +"history between the upstream and HEAD contains commits which make changes to " +"upstream files. If it is not specified, the same algorithm is used as for " +"git-debrebase new-upstream." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:275 +msgid "" +"It is also a snag if the specified upstream has a debian/ subdirectory. " +"This check exists to detect certain likely user errors, but if this " +"situation is true and expected, forcing it is fine." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:281 +msgid "" +"git-debrebase will try to look for the dgit archive view of the most recent " +"release, and if it finds it will make a pseduomerge so that your new git-" +"debrebase view is appropriately fast forward." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:286 +msgid "" +"The result is a well-formed git-debrebase interchange branch. The result is " +"also fast-forward from the gbp branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:289 +msgid "" +"It is a snag if the new branch looks like it will have diverged, just as for " +"a laundering/unstitching call to git-debrebase; See L</Establish the current " +"branch's ffq-prev>, below." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:293 +msgid "" +"Note that it is dangerous not to know whether you are dealing with a gbp " +"patches-unapplied branch containing quilt patches, or a git-debrebase " +"interchange branch. At worst, using the wrong tool for the branch format " +"might result in a dropped patch queue!" +msgstr "" + +#. type: =head1 +#: ../git-debrebase.1.pod:302 +msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:306 +msgid "git-debrebase breakwater" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:308 +msgid "" +"Prints the breakwater tip commitid. If your HEAD branch is not fully " +"laundered, prints the tip of the so-far-laundered breakwater." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:312 +msgid "git-debrebase anchor" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:314 +msgid "Prints the breakwater anchor commitid." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:316 +msgid "git-debrebase analyse" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:318 +msgid "" +"Walks the history of the current branch, most recent commit first, back " +"until the most recent anchor, printing the commit object id, and commit type " +"and info (ie the semantics in the git-debrebase model) for each commit." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:326 +msgid "git-debrebase record-ffq-prev" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:328 +msgid "" +"Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING " +"AND LAUNDERING>, but does not launder the branch or move HEAD." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:332 +msgid "" +"It is an error if the ffq-prev could not be recorded. It is also an error " +"if an ffq-prev has already been recorded, unless --noop-ok." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:336 +msgid "git-debrebase launder-v0" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:338 +msgid "" +"Launders the branch without recording anything in ffq-prev. Then prints " +"some information about the current branch. Do not use this operation; it " +"will be withdrawn soon." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:343 +msgid "git-debrebase convert-to-gbp" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:345 +msgid "" +"Converts a laundered branch into a gbp patches-unapplied branch containing " +"quilt patches. The result is not fast forward from the interchange branch, " +"and any ffq-prev is deleted." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:350 +msgid "" +"This is provided mostly for the test suite and for unusual situations. It " +"should only be used with a care and with a proper understanding of the " +"underlying theory." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:355 +msgid "" +"Be sure to not accidentally treat the result as a git-debrebase branch, or " +"you will drop all the patches!" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:359 +msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:361 +msgid "" +"Converts any dgit-compatible git branch corresponding to a (possibly " +"hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " +"branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:365 +msgid "" +"This operation should not be used if the branch is already in git-debrebase " +"form. Normally git-debrebase will refuse to continue in this case (or " +"silently do nothing if the global --noop-ok option is used)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:370 +msgid "" +"Some representation of the original upstream source code will be needed. If " +"I<upstream> is supplied, that must be a suitable upstream commit. By " +"default, git-debrebase will look first for git tags (as for new-upstream), " +"and then for orig tarballs which it will ask dgit to process." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:376 +msgid "" +"The upstream source must be exactly right and all the patches in debian/" +"patches must be up to date. Applying the patches from debian/patches to the " +"upstream source must result in exactly your HEAD." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:381 +msgid "" +"The output is laundered and stitched. The resulting history is not " +"particularly pretty, especially if orig tarball(s) were imported to produce " +"a synthetic upstream commit." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:386 +msgid "" +"The available convert-options are as follows. (These must come after " +"convert-from-dgit-view.)" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:391 +msgid "--[no-]diagnose" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:393 +msgid "" +"Print additional error messages to help diagnose failure to find an " +"appropriate upstream. --no-diagnose is the default." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:397 +msgid "--build-products-dir" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:399 +msgid "" +"Directory to look in for orig tarballs. The default is the git config " +"option dgit.default.build-products-dir or failing that, C<..>. Passed on to " +"dgit, if git-debrebase invokes dgit." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:405 +msgid "--[no-]origs" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:407 +msgid "" +"Whether to try to look for or use any orig tarballs. --origs is the default." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:410 +msgid "--[no-]tags" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:412 +msgid "" +"Whether to try to look for or use any upstream git tags. --tags is the " +"default." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:415 +msgid "--always-convert-anyway" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:417 +msgid "" +"Perform the conversion operation, producing unpleasant extra history, even " +"if the branch seems to be in git-debrebase form already. This should not be " +"done unless necessary, and it should not be necessary." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:425 +msgid "git-debrebase forget-was-ever-debrebase" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:427 +msgid "" +"Deletes the ffq-prev and debrebase-last refs associated with this branch, " +"that git-debrebase and dgit use to determine whether this branch is managed " +"by git-debrebase, and what previous head may need to be stitched back in." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:433 +msgid "" +"This can be useful if you were just playing with git-debrebase, and have " +"used git-reset --hard to go back to a commit before your experiments." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:437 +msgid "Do not use this if you expect to run git-debrebase on the branch again." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:443 +msgid "" +"This section documents the general options to git-debrebase (ie, the ones " +"which immediately follow git-debrebase or git debrebase on the command " +"line). Individual operations may have their own options which are docuented " +"under each operation." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:455 +msgid "-f<snag-id>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:457 +msgid "Turns snag(s) with id <snag-id> into warnings." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:459 +msgid "" +"Some troublesome things which git-debrebase encounters are B<snag>s. (The " +"specific instances are discussed in the text for the relevant operation.)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:464 +msgid "" +"When a snag is detected, a message is printed to stderr containing the snag " +"id (in the form C<-f<snag-idE<gt>>), along with some prose." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:469 +msgid "" +"If snags are detected, git-debrebase does not continue, unless the relevant -" +"f<snag-id> is specified, or --force is specified." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:473 +msgid "--force" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:475 +msgid "Turns all snags into warnings. See the -f<snag-id> option." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:478 +msgid "" +"Do not invoke git-debrebase --force in scripts and aliases; instead, specify " +"the particular -f<snag-id> for expected snags." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:481 +msgid "--noop-ok" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:483 +msgid "" +"Suppresses the error in some situations where git-debrebase does nothing, " +"because there is nothing to do." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:487 +msgid "" +"The specific instances are discussed in the text for the relvant operation." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:490 +msgid "--anchor=<commit-ish>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:492 +msgid "" +"Treats <commit-ish> as an anchor. This overrides the usual logic which " +"automatically classifies commits as anchors, pseudomerges, delta queue " +"commits, etc." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:496 +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." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:503 +msgid "--dgit=<program>" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:505 +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:509 +msgid "-D" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:511 +msgid "Requests (more) debugging. May be repeated." +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:513 +msgid "--experimntal-merge-resolution" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:515 +msgid "" +"Enable experimental code for handling general merges (see L<git-debrebase(5)/" +"General merges>)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:518 +msgid "" +"This option may generate branch structures that require the use of this same " +"option by other people. Also you may experience lossage of various kinds, " +"including false error messages, references to nonexistent documentation, " +"being handed an incomprehensible pile of multidimensional merge wreckage, " +"and/or possible mangling of your package's source code." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.1.pod:529 +msgid "UNSTITCHING AND LAUNDERING" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:531 +msgid "" +"Several operations unstitch and launder the branch first. In detail this " +"means:" +msgstr "" + +#. type: =head2 +#: ../git-debrebase.1.pod:534 +msgid "Establish the current branch's ffq-prev" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:536 +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 " +"depend on the current branch (and its git configuration) and are as follows:" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:548 +msgid "" +"The branch that git would merge from (remote.<branch>.merge, remote.<branch>." +"remote);" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:553 +msgid "" +"The branch git would push to, if different (remote.<branch>.pushRemote etc.);" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:558 +msgid "For local dgit suite branches, the corresponding tracking remote;" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:563 +msgid "If you are on C<master>, remotes/dgit/dgit/sid." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:568 +msgid "" +"The apparently relevant ref names to check are filtered through branch." +"<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " +"each optionally preceded by !; first match wins." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:573 +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 " +"the remote tracking refs: git-debrebase does not fetch anything from " +"anywhere." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:579 +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:583 +msgid "Examine the branch" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:585 +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:590 +msgid "Rewrite the commits into laundered form" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:592 +msgid "" +"Mixed debian+upstream commits are split into two commits each. Delta queue " +"(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " +"additions, are dropped." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:598 +msgid "" +"This rewrite will always succeed, by construction. The result is the " +"laundered branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:603 +msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)" +msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot new file mode 100644 index 0000000..f5c7df7 --- /dev/null +++ b/po4a/git-debrebase_5.pot @@ -0,0 +1,1127 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../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 +#, 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 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: =head1 +#: ../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 +msgid "INTRODUCTION" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 +msgid "" +"git-debrebase is a tool for representing in git, and manpulating, Debian " +"packages based on upstream source code." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:3 +msgid "git-debrebase - git data model for Debian packaging" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:11 +msgid "" +"The Debian packaging has a fast forwarding history. The delta queue " +"(changes to upstream files) is represented as a series of individual git " +"commits, which can worked on with rebase, and also shared." +msgstr "" + +#. type: =head2 +#: ../git-debrebase.5.pod:18 +msgid "DISCUSSION" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:20 +msgid "" +"git-debrebase is designed to work well with dgit. git-debrebase can also be " +"used in workflows without source packages, for example to work on Debian-" +"format packages outside or alongside Debian." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:24 +msgid "" +"git-debrebase itself is not very suitable for use by Debian derivatives, to " +"work on packages inherited from Debian, because it assumes that you want to " +"throw away any packaging provided by your upstream. However, use of git-" +"debrebase in Debian does not make anything harder for derivatives, and it " +"can make some things easier." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:32 +msgid "" +"When using gitk on branches managed by git-debrebase, B<gitk --date-order>, " +"B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful " +"output than the default." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:37 +msgid "TERMINOLOGY" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:41 +msgid "Pseudomerge" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:43 +msgid "" +"A merge which does not actually merge the trees; instead, it is constructed " +"by taking the tree from one of the parents (ignoring the contents of the " +"other parents). These are used to make a rewritten history fast forward " +"from a previous tip, so that it can be pushed and pulled normally. Manual " +"construction of pseudomerges can be done with C<git merge -s ours> but is " +"not normally needed when using git-debrebase." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:54 +msgid "Packaging files" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:56 +msgid "" +"Files in the source tree within B<debian/>, excluding anything in B<debian/" +"patches/>." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:59 +msgid "Upstream" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:61 +msgid "" +"The version of the package without Debian's packaging. Typically provided " +"by the actual upstream project, and sometimes tracked by Debian contributors " +"in a branch C<upstream>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:65 +msgid "" +"Upstream contains upstream files, but some upstreams also contain packaging " +"files in B<debian/>. Any such non-upstream files found in upstream are " +"thrown away by git-debrebase each time a new upstream version is " +"incorporated." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:71 +msgid "Upstream files" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:73 +msgid "" +"Files in the source tree outside B<debian/>. These may include unmodified " +"source from upstream, but also files which have been modified or created for " +"Debian." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:77 +msgid "Delta queue" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:79 +msgid "Debian's changes to upstream files: a series of git commits." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:82 +msgid "Quilt patches" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:84 +msgid "" +"Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 " +"(quilt) .dsc source package format. Not used, often deleted, and " +"regenerated when needed (such as when uploading to Debian), by git-debrebase." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:90 +msgid "Interchange branch; breakwater; stitched; laundered" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:92 +msgid "See L</BRANCHES AND BRANCH STATES - OVERVIEW>." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:94 +msgid "Anchor; Packaging" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:96 +msgid "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:98 +msgid "ffq-prev; debrebase-last" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:100 +msgid "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:104 +msgid "DIAGRAM" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:106 +#, no-wrap +msgid "" +" ------/--A!----/--B3!--%--/--> interchange view\n" +" / / / with debian/ directory\n" +" % % % entire delta queue applied\n" +" / / / 3.0 (quilt) has debian/patches\n" +" / / 3* \"master\" on Debian git servers\n" +" / / /\n" +" 2* 2* 2\n" +" / / /\n" +" 1 1 1 breakwater branch, merging baseline\n" +" / / / unmodified upstream code\n" +" ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n" +" / / / no ref refers to this: we\n" +" --#-----#-------#-----> upstream reconstruct its identity by\n" +" inspecting interchange branch\n" +" Key:\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:122 +#, no-wrap +msgid "" +" 1,2,3 commits touching upstream files only\n" +" A,B,C commits touching debian/ only\n" +" B3 mixed commit (eg made by an NMUer)\n" +" # upstream releases\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:127 +#, no-wrap +msgid "" +" -@- anchor merge, takes contents of debian/ from the\n" +" / previous `breakwater' commit and rest from upstream\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:130 +#, no-wrap +msgid "" +" -/- pseudomerge; contents are identical to\n" +" / parent lower on diagram.\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:133 +#, no-wrap +msgid "" +" % dgit- or git-debrebase- generated commit of debian/patches.\n" +" `3.0 (quilt)' only; generally dropped by git-debrebase.\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:136 +#, no-wrap +msgid "" +" * Maintainer's HEAD was here while they were editing,\n" +" before they said they were done, at which point their\n" +" tools made -/- (and maybe %) to convert to\n" +" the fast-forwarding interchange branch.\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:141 +#, no-wrap +msgid "" +" ! NMUer's HEAD was here when they said `dgit push'.\n" +" Rebase branch launderer turns each ! into an\n" +" equivalent *.\n" +"\n" +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:145 +msgid "BRANCHES AND BRANCH STATES - OVERVIEW" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:147 +msgid "" +"git-debrebase has one primary branch, the B<interchange branch>. This " +"branch is found on Debian contributor's workstations (typically, a " +"maintainer would call it B<master>), in the Debian dgit git server as the " +"suite branch (B<dgit/dgit/sid>) and on other git servers which support " +"Debian work (eg B<master> on salsa)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:155 +msgid "" +"The interchange branch is fast-forwarding (by virtue of pseudomerges, where " +"necessary)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:158 +msgid "" +"It is possible to have multiple different interchange branches for the same " +"package, stored as different local and remote git branches. However, " +"divergence should be avoided where possible - see L</OTHER MERGES>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:164 +msgid "" +"A suitable interchange branch can be used directly with dgit. In this case " +"each dgit archive suite branch is a separate interchange branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:168 +msgid "" +"Within the ancestry of the interchange branch, there is another important, " +"implicit branch, the B<breakwater>. The breakwater contains unmodified " +"upstream source, but with Debian's packaging superimposed (replacing any " +"C<debian/> directory that may be in the upstream commits). The breakwater " +"does not contain any representation of the delta queue (not even debian/" +"patches). The part of the breakwater processed by git-debrebase is the part " +"since the most reecent B<anchor>, which is usually a special merge generated " +"by git-debrebase." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:181 +msgid "" +"When working, locally, the user's branch can be in a rebasing state, known " +"as B<unstitched>. While a branch is unstitched, it is not in interchange " +"format. The previous interchange branch tip is recorded, so that the " +"previous history and the user's work can later be stitched into the fast-" +"forwarding interchange form." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:193 +msgid "" +"An unstitched branch may be in B<laundered> state, which means it has a more " +"particular special form convenient for manipulating the delta queue." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:199 +msgid "BRANCH CONTENTS - DETAILED SPECIFICATION" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:201 +msgid "" +"It is most convenient to describe the B<breakwater> branch first. A " +"breakwater is B<fast-forwarding>, but is not usually named by a ref. It " +"contains B<in this order> (ancestors first):" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:210 +msgid "Anchor" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:212 +msgid "An B<anchor> commit, which is usually a special two-parent merge:" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:215 +msgid "" +"The first parent contains the most recent version, at that point, of the " +"Debian packaging (in debian/); it also often contains upstream files, but " +"they are to be ignored. Often the first parent is a previous breakwater tip." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:222 +msgid "" +"The second parent is an upstream source commit. It may sometimes contain a " +"debian/ subdirectory, but if so that is to be ignored. The second parent's " +"upstream files are identical to the anchor's. Anchor merges always contain " +"C<[git-debrebase anchor: ...]> as a line in the commit message." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:232 +msgid "" +"Alternatively, an anchor may be a single-parent commit which introduces the " +"C<debian/> directory and makes no other changes: ie, the start of Debian " +"packaging." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:237 +msgid "Packaging" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:239 +msgid "" +"Zero or more single-parent commits containing only packaging changes. (And " +"no quilt patch changes.)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:245 +msgid "" +"The B<laundered> branch state is B<rebasing>. A laundered branch is based " +"on a breakwater but also contains, additionally, B<after> the breakwater, a " +"representation of the delta queue:" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:255 +msgid "Delta queue commits" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:257 +msgid "" +"Zero or more single-parent commits contaioning only changes to upstream " +"files." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:262 +msgid "" +"The merely B<unstitched> (ie, unstitched but unlaundered) branch state is " +"also B<rebasing>. It has the same contents as the laundered state, except " +"that it may contain, additionally, in B<in any order but after the " +"breakwater>:" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:273 +msgid "Linear commits to the source" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:275 +msgid "" +"Further commit(s) containing changes to to upstream files and/or to " +"packaging, possibly mixed within a single commit. (But not quilt patch " +"changes.)" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:282 +msgid "Quilt patch addition for `3.0 (quilt)'" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:284 +msgid "" +"Commit(s) which add patches to B<debian/patches/>, and add those patches to " +"the end of B<series>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:287 +msgid "" +"These are only necessary when working with packages in C<.dsc 3.0 (quilt)> " +"format. For git-debrebase they are purely an output; they are deleted when " +"branches are laundered. git-debrebase takes care to make a proper patch " +"series out of the delta queue, so that any resulting source packages are " +"nice." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:297 +msgid "" +"Finally, an B<interchange> branch is B<fast forwarding>. It has the same " +"contents as an unlaundered branch state, but may (and usually will) " +"additionally contain (in some order, possibly intermixed with the extra " +"commits which may be found on an unstitched unlaundered branch):" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:309 +msgid "Pseudomerge to make fast forward" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:311 +msgid "" +"A pseudomerge making the branch fast forward from previous history. The " +"contributing parent is itself in interchange format. Normally the " +"overwritten parent is a previous tip of an interchange branch, but this is " +"not necessary as the overwritten parent is not examined." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:319 +msgid "" +"If the two parents have identical trees, the one with the later commit date " +"(or, if the commit dates are the same, the first parent) is treated as the " +"contributing parent." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:326 +msgid "dgit dsc import pseudomerge" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:328 +msgid "" +"Debian .dsc source package import(s) made by dgit (during dgit fetch of a " +"package most recently uploaded to Debian without dgit, or during dgit import-" +"dsc)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:334 +msgid "" +"git-debrebase requires that each such import is in the fast-forwarding " +"format produced by dgit: a two-parent pseudomerge, whose contributing parent " +"is in the non-fast-forwarding dgit dsc import format (not described further " +"here), and whose overwritten parent is the previous interchange tip (eg, the " +"previous tip of the dgit suite branch)." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:347 +msgid "STITCHING, PSEUDO-MERGES, FFQ RECORD" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:349 +msgid "" +"Whenever the branch C<refs/B> is unstitched, the previous head is recorded " +"in the git ref C<refs/ffq-prev/B>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:352 +msgid "" +"Unstiched branches are not fast forward from the published interchange " +"branches [1]. So before a branch can be pushed, the right pseudomerge must " +"be reestablished. This is the stitch operation, which consumes the ffq-prev " +"ref." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:359 +msgid "" +"When the user has an unstitched branch, they may rewrite it freely, from the " +"breakwater tip onwards. Such a git rebase is the default operation for git-" +"debrebase. Rebases should not go back before the breakwater tip, and " +"certainly not before the most recent anchor." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:366 +msgid "" +"Unstitched branches must not be pushed to interchange branch refs (by the " +"use of C<git push -f> or equivalent). It is OK to share an unstitched " +"branch in similar circumstances and with similar warnings to sharing any " +"other rebasing git branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:372 +msgid "" +"[1] Strictly, for a package which has never had a Debian delta queue, the " +"interchange and breakwater branches may be identical, in which case the " +"unstitched branch is fast forward from the interchange branch and no " +"pseudomerge is needed." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:378 +msgid "" +"When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor " +"of refs/B, (usually, the result of last stitch). This is used for status " +"printing and some error error checks - especially for printing guesses what " +"a problem is. To determine whether a branch is is being maintained in git-" +"debrebase form it is necessary to walk its history." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:387 +msgid "OTHER MERGES" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:389 +msgid "" +"Note that the representation described here does not permit general merges " +"on any of the relevant branches. For this reason the tools will try to help " +"the user avoid divergence of the interchange branch." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:394 +msgid "" +"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours " +"should be be avoided because they might generate such merges." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:400 +msgid "" +"Automatic resolution of divergent interchange branches (or laundering of " +"merges on the interchange branch) is thought to be possible, but there is " +"no tooling for this yet:" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:405 +msgid "" +"Nonlinear (merging) history in the interchange branch is awkward because it " +"(obviously) does not preserve the linearity of the delta queue. Easy " +"merging of divergent delta queues is a research problem." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:410 +msgid "" +"Nonlinear (merging) history in the breakwater branch is in principle " +"tolerable, but each of the parents would have to be, in turn, a breakwater, " +"and difficult questions arise if they don't have the same anchor." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:416 +msgid "" +"We use the commit message annotation to distinguish the special anchor " +"merges from other general merges, so we can at least detect unsupported " +"merges." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:420 +msgid "LEGAL OPERATIONS" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:422 +msgid "" +"The following basic operations follows from this model (refer to the diagram " +"above):" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:427 +msgid "Append linear commits" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:429 +msgid "" +"No matter the branch state, it is always fine to simply git commit (or " +"cherry-pick etc.) commits containing upstream file changes, packaging " +"changes, or both." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:435 +msgid "(This may make the branch unlaundered.)" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:437 +msgid "Launder branch" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:439 +msgid "" +"Record the previous head in ffq-prev, if we were stitched before (and delete " +"debrebase-last)." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:443 +msgid "" +"Reorganise the current branch so that the packaging changes come first, " +"followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:448 +msgid "Drop pseudomerges and any quilt patch additions." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:450 +msgid "Interactive rebase" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:452 +msgid "" +"With a laundered branch, one can do an interactive git rebase of the delta " +"queue." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:455 +msgid "New upstream rebase" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:457 +msgid "" +"Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> " +"into C<(...#..@-A-B-, ...#'-)@'-1-2>." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:460 +msgid "" +"This has to be a wrapper around git-rebase, which prepares @' and then tries " +"to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' " +"doesn't appear in the commit list, since @' is the newbase of the rebase " +"(see git-rebase(1))." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:466 +msgid "" +"Note that the construction of @' cannot fail because @' simply copies " +"debian/ from B and and everything else from #'. (Rebasing A and B is " +"undesirable. We want the debian/ files to be non-rebasing so that git log " +"shows the packaging history.)" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:472 +msgid "Stitch" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:474 +msgid "" +"Make a pseudomerge, whose contributing parent to is the unstitched branch " +"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process " +"(and writing debrebase-last instead). Ideally the contributing parent would " +"be a laundered branch, or perhaps a laundered branch with a quilt patch " +"addition commit." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:483 +msgid "Commit quilt patches" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:485 +msgid "" +"To generate a tree which can be represented as a 3.0 (quilt) .dsc source " +"packages, the delta queue must be reified inside the git tree in B<debian/" +"patches/>. These patch files can be stripped out and/or regenerated as " +"needed." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:493 +msgid "ILLEGAL OPERATIONS" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:495 +msgid "" +"Some git operations are not permitted in this data model. Performing them " +"will break git-debrebase." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:500 +msgid "General merges" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:502 +msgid "See L</OTHER MERGES>, above." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:504 +msgid "git-rebase starting too soon, or without base argument" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:506 +msgid "" +"git-rebase must not be invoked in such a way that the chosen base is before " +"the anchor, or before the last pseudomerge. This is because git-rebase " +"mangles merges. git rebase --preserve-merges is also dangerous." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:512 +msgid "git-rebase without a base argument will often start too early." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:514 +msgid "" +"For these reasons, it is better to use git-debrebase and let it choose the " +"base for your rebase. If you do realise you have make this mistake, it is " +"best to use the reflog to recover to a suitable good previous state." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:522 +msgid "Editing debian/patches" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:524 +msgid "" +"debian/patches is an output from git-debrebase, not an input. If you edit " +"patches git-debrebase will complain and refuse to work. If you add patches " +"your work is likely to be discarded." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:530 +msgid "" +"Instead of editing patches, use git-debrebase to edit the corresponding " +"commits." +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:533 +msgid "Renaming (etc.) branch while unstitched" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:535 +msgid "" +"The previous HEAD, which will be pseudomerged over by operations like git-" +"debrebase stitch, is recorded in a ref name dervied from your branch name." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:540 +msgid "" +"If you rename unstitched branches, this information can get out of step." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:543 +msgid "" +"Conversely, creating a new branch from an unstitched branch is good for " +"making a branch to play about in, but the result cannot be stitched." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:550 +msgid "COMMIT MESSAGE ANNOTATIONS" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:552 +msgid "" +"git-debrebase makes annotations in the messages of commits it generates." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:555 +msgid "The general form is" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:557 +#, no-wrap +msgid "" +" [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:559 +msgid "" +"git-debrebase treats anything after the colon as a comment, paying no " +"attention to PROSE." +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:562 +#, no-wrap +msgid "" +"The full set of annotations is:\n" +" [git-debrebase split: mixed commit, debian part]\n" +" [git-debrebase split: mixed commit, upstream-part]\n" +" [git-debrebase onvert dgit import: debian changes]\n" +" [git-debrebase anchor: convert dgit import, upstream changes]\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:568 +#, no-wrap +msgid "" +" [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n" +" [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n" +" [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n" +" [git-debrebase make-patches: export and commit patches]\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:573 +#, no-wrap +msgid "" +" [git-debrebase convert-from-gbp: drop patches]\n" +" [git-debrebase anchor: declare upstream]\n" +" [git-debrebase pseudomerge: stitch]\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:577 +#, no-wrap +msgid "" +" [git-debrebase merged-breakwater: constructed from vanilla merge]\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:579 +#, no-wrap +msgid "" +" [git-debrebase convert-to-gbp: commit patches]\n" +" [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n" +" [git-debrebase convert-from-dgit-view drop-patches]\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:583 +msgid "" +"Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-" +"parent anchors are not generated by git-debrebase, and when made manually " +"should not contain any C<[git-debrebase ...]> annotation." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:588 +msgid "" +"The C<split mixed commit> and C<convert dgit import> tags are added to the " +"pre-existing commit message, when git-debrebase rewrites the commit." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.5.pod:592 +msgid "APPENDIX - DGIT IMPORT HANDLING" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:594 +msgid "" +"The dgit .dsc import format is not documented or specified (so some of the " +"following terms are not defined anywhere). The dgit import format it is " +"defined by the implementation in dgit, of which git-debrebase has special " +"knowledge." +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:599 +msgid "Consider a non-dgit NMU followed by a dgit NMU:" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:601 +#, no-wrap +msgid "" +" interchange --/--B3!--%--//----D*-->\n" +" / /\n" +" % 4\n" +" / 3\n" +" / 2\n" +" / 1\n" +" 2 &_\n" +" / /| \\\n" +" 1 0 00 =XBC%\n" +" /\n" +" /\n" +" --@--A breakwater\n" +" /\n" +" --#--------> upstream\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:617 +#, no-wrap +msgid "" +" Supplementary key:\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:619 +#, no-wrap +msgid "" +" =XBC% dgit tarball import of .debian.tar.gz containing\n" +" Debian packaging including changes B C and quilt patches\n" +" 0 dgit tarball import of upstream tarball\n" +" 00 dgit tarball import of supplementary upstream piece\n" +" &_ dgit import nearly-breakwater-anchor\n" +" // dgit fetch / import-dsc pseudomerge to make fast forward\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:626 +#, no-wrap +msgid "" +" &' git-debrebase converted import (upstream files only)\n" +" C' git-debrebase converted packaging change import\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:629 +#, no-wrap +msgid "" +" * ** before and after HEAD\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:631 +msgid "We want to transform this into:" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:635 +msgid "I. No new upstream version" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:637 +#, no-wrap +msgid "" +" (0 + 00 eq #)\n" +" --/--B3!--%--//-----D*-------------/-->\n" +" / / /\n" +" % 4 4**\n" +" / 3 3\n" +" / 2 2\n" +" / 1 1\n" +" 2 &_ /\n" +" / /| \\ /\n" +" 1 0 00 =XBC% /\n" +" / /\n" +" / /\n" +" --@--A-----B---------------------C'---D\n" +" /\n" +" --#----------------------------------------->\n" +"\n" +msgstr "" + +#. type: =item +#: ../git-debrebase.5.pod:653 +msgid "II. New upstream" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:655 +#, no-wrap +msgid "" +" (0 + 00 neq #)\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.5.pod:657 +#, no-wrap +msgid "" +" --/--B3!--%--//-----D*-------------/-->\n" +" / / /\n" +" % 4 4**\n" +" / 3 3\n" +" / 2 2\n" +" / 1 1\n" +" 2 &_ /\n" +" / /| \\ /\n" +" 1 0 00 =XBC% /\n" +" / /\n" +" / /\n" +" --@--A-----B-----------------@---C'---D\n" +" / /\n" +" --#--------------------- - - / - - --------->\n" +" /\n" +" &'\n" +" /|\n" +" 0 00\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.5.pod:680 +msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1)" +msgstr "" |