1 # SOME DESCRIPTIVE TITLE
2 # Copyright (C) YEAR Free Software Foundation, Inc.
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "POT-Creation-Date: 2018-10-04 01:04+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
20 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
21 #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
22 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
23 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
24 #: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
30 #: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
31 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
32 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
33 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
34 #: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
35 #: ../git-debrebase.5.pod:678
41 #: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35
47 #: ../dgit-nmu-simple.7.pod:3
48 msgid "dgit-nmu-simple - tutorial for DDs wanting to NMU with git"
52 #: ../dgit-nmu-simple.7.pod:5 ../dgit-sponsorship.7.pod:5
53 msgid "INTRODUCTION AND SCOPE"
57 #: ../dgit-nmu-simple.7.pod:7
59 "This tutorial describes how a Debian Developer can do a straightforward NMU "
60 "of a package in Debian, using dgit."
64 #: ../dgit-nmu-simple.7.pod:11
66 "This document won't help you decide whether an NMU is a good idea or whether "
67 "it be well received. The Debian Developers' Reference has some (sometimes "
68 "questionable) guidance on this."
72 #: ../dgit-nmu-simple.7.pod:17
74 "Conversely, you do not need to know anything about the usual maintainer's "
75 "git workflow. If appropriate, you can work on many different packages, "
76 "making similar changes, without worrying about the individual maintainers' "
81 #: ../dgit-nmu-simple.7.pod:23
83 "This tutorial only covers changes which can sensibly be expressed as a "
84 "reasonably small number of linear commits (whether to Debian packaging or to "
85 "upstream files or both)."
89 #: ../dgit-nmu-simple.7.pod:28
91 "If you want to do a new upstream version, you probably want to do as the "
92 "maintainer would have done. You'll need to find out what the maintainer's "
93 "git practices are and consult the appropriate C<dgit-maint-*(7)> workflow "
98 #: ../dgit-nmu-simple.7.pod:39
101 " % dgit clone glibc jessie\n"
103 " % git am ~/glibc-security-fix.diff\n"
104 " % dch --nmu \"Apply upstream's fix for foo bug.\"\n"
105 " % git add debian/changelog && git commit -m\"NMU changelog entry\"\n"
106 " % dpkg-buildpackage -uc -b\n"
107 " [ run your tests ]\n"
108 " % dch -r && git add debian/changelog && git commit -m\"Finalise NMU\"\n"
109 " % dgit -wgf sbuild -A -c jessie\n"
110 " [ final tests on generated .debs ]\n"
111 " % dgit -wgf [--delayed=5] push jessie\n"
112 " [ enter your gnupg passphrase as prompted ]\n"
113 " [ see that push and upload are successful ]\n"
114 " [ prepare and email NMU diff (git-diff, git-format-patch) ]\n"
119 #: ../dgit-nmu-simple.7.pod:56
120 msgid "WHAT KIND OF CHANGES AND COMMITS TO MAKE"
124 #: ../dgit-nmu-simple.7.pod:58
126 "When preparing an NMU, the git commits you make on the dgit branch should be "
127 "simple linear series of commits with good commit messages. The commit "
128 "messages will be published in various ways, including perhaps being used as "
129 "the cover messages for generated quilt patches."
133 #: ../dgit-nmu-simple.7.pod:64
135 "Do not make merge commits. Do not try to rebase to drop patches - if you "
136 "need to revert a change which is actually a Debian patch, use git-revert."
140 #: ../dgit-nmu-simple.7.pod:69
142 "If you need to modify a Debian patch, make a new commit which fixes what "
143 "needs fixing, and explain in the commit message which patch it should be "
144 "squashed with (perhaps by use of a commit message in C<git rebase --"
145 "autosquash -i> format)."
149 #: ../dgit-nmu-simple.7.pod:76
151 "(Of course if you have specific instructions from the maintainer, you can "
152 "follow those instead. But the procedure in this tutorial is legitimate for "
153 "any maintainer, in the sense that it should generate an upload to which the "
154 "maintainer cannot reasonably object.)"
158 #: ../dgit-nmu-simple.7.pod:82
159 msgid "RELEVANT BRANCHES"
163 #: ../dgit-nmu-simple.7.pod:84
165 "dgit clone will put you on a branch like C<dgit/sid>. There is a pseudo-"
166 "remote called C<dgit> which also contains a branch like C<dgit/sid>, so you "
167 "do things like C<git diff dgit/dgit/sid> to see what changes you have made."
171 #: ../dgit-nmu-simple.7.pod:90
172 msgid "KEEPING YOUR WORKING TREE TIDY"
176 #: ../dgit-nmu-simple.7.pod:92
178 "Don't forget to C<git add> any new files you create. Otherwise git clean "
179 "(which is requested with the C<-wgf> option in the recipe above) will "
184 #: ../dgit-nmu-simple.7.pod:97
186 "Many package builds leave dirty git trees. So, commit before building. "
187 "That way you can use C<git reset --hard>."
191 #: ../dgit-nmu-simple.7.pod:101
193 "If you follow this approach you don't need to care about the build dirtying "
194 "the tree. It also means you don't care about the package clean target, "
195 "which is just as well because many package clean targets are broken."
199 #: ../dgit-nmu-simple.7.pod:107
200 msgid "OTHER GIT BRANCHES"
204 #: ../dgit-nmu-simple.7.pod:109
206 "The dgit git history (visible in gitk and git log) is not necessarily "
207 "related to the maintainer's or upstream's git history (if any)."
211 #: ../dgit-nmu-simple.7.pod:114
213 "If the maintainer has advertised a git repo with Vcs-Git dgit will set up a "
214 "remote for it, so you can do"
218 #: ../dgit-nmu-simple.7.pod:121
221 " % git fetch vcs-git\n"
226 #: ../dgit-nmu-simple.7.pod:125
228 "You can cherry pick changes from there, for example. Note that the "
229 "maintainer's git history may not be suitable for use with dgit. For "
230 "example, it might be a patches-unapplied branch or even contain only a "
235 #: ../dgit-nmu-simple.7.pod:131
236 msgid "UPLOADING TO DELAYED"
240 #: ../dgit-nmu-simple.7.pod:133
242 "You can use dgit's I<--delayed> option to upload to the DELAYED queue. "
243 "However, you should read the warning about this option in dgit(1)."
247 #: ../dgit-nmu-simple.7.pod:139
248 msgid "dgit(1), dgit(7), dgit-maint-*(7)"