1
=== modified file '.bzrignore'
2
--- .bzrignore	2010-11-17 14:39:13 +0000
3
+++ .bzrignore	2012-03-20 20:48:20 +0000
4
@@ -1,1 +1,4 @@
5
1
_build
1
_build
6
2
po/*
7
3
!po/*.pot
8
4
!po/*.po
9
2
5
10
=== modified file 'Makefile'
11
--- Makefile	2010-11-17 14:00:59 +0000
12
+++ Makefile	2012-03-20 20:48:20 +0000
13
@@ -11,8 +11,12 @@
14
11
PAPEROPT_a4     = -D latex_paper_size=a4
11
PAPEROPT_a4     = -D latex_paper_size=a4
15
12
PAPEROPT_letter = -D latex_paper_size=letter
12
PAPEROPT_letter = -D latex_paper_size=letter
16
13
ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
13
ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
17
14
# the i18n builder cannot share the environment and doctrees with the others
18
15
PODIR         = po
19
16
I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
20
17
LANGS = $(basename $(notdir $(wildcard $(PODIR)/*.po)))
21
14
18
23
15
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
19
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext locale
24
16
20
25
17
help:
21
help:
26
18
	@echo "Please use \`make <target>' where <target> is one of"
22
	@echo "Please use \`make <target>' where <target> is one of"
27
@@ -31,28 +35,57 @@
28
31
	@echo "  man        to make manual pages"
35
	@echo "  man        to make manual pages"
29
32
	@echo "  texinfo    to make Texinfo files"
36
	@echo "  texinfo    to make Texinfo files"
30
33
	@echo "  info       to make Texinfo files and run them through makeinfo"
37
	@echo "  info       to make Texinfo files and run them through makeinfo"
32
34
	@echo "  gettext    to make PO message catalogs"
38
	@echo "  gettext    to (re)generate the .pot file using sphinx gettext"
33
39
	@echo "  locale     to compile .mo files from the .po files."
34
35
	@echo "  changes    to make an overview of all changed/added/deprecated items"
40
	@echo "  changes    to make an overview of all changed/added/deprecated items"
35
36
	@echo "  linkcheck  to check all external links for integrity"
41
	@echo "  linkcheck  to check all external links for integrity"
36
37
	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
42
	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
37
38
43
38
39
clean:
44
clean:
40
40
	-rm -rf $(BUILDDIR)/*
45
	-rm -rf $(BUILDDIR)/* $(PODIR)/.doctrees \
41
46
	$(foreach lang,$(LANGS),$(PODIR)/$(lang)/)
42
41
47
44
42
html:
48
html: $(foreach lang,$(LANGS),html-$(lang))
45
49
	# Always build an English version, even if there are no .po files.
46
43
	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
50
	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
56
44
	@echo
51
	mv $(BUILDDIR)/html/ubuntu-packaging-guide/*html $(BUILDDIR)/html/
57
45
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
52
	sed -i 's/href="..\//href=".\//g' $(BUILDDIR)/html/*html
58
46
53
	sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/*html
59
47
dirhtml:
54
	@echo
60
48
	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
55
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/en"
61
49
	@echo
56
html-%: locale
62
50
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
57
	$(SPHINXBUILD) -Dlanguage=$* -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html/$*
63
51
58
	mv $(BUILDDIR)/html/$*/ubuntu-packaging-guide/*html  $(BUILDDIR)/html/$*
64
52
singlehtml:
59
	sed -i 's/href="..\//href=".\//g' $(BUILDDIR)/html/$*/*html
65
60
	sed -i 's/..\/_images/.\/_images/g' $(BUILDDIR)/html/$*/*html
66
61
	@echo
67
62
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$*."
68
63
69
64
dirhtml: $(foreach lang,$(LANGS),dirhtml-$(lang))
70
65
	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml/en
71
66
	@echo
72
67
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml/en"
73
68
dirhtml-%: locale
74
69
	$(SPHINXBUILD) -Dlanguage=$* -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml/$*
75
70
	@echo
76
71
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml/$*."
77
72
78
73
singlehtml: $(foreach lang,$(LANGS),singlehtml-$(lang))
79
53
	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
74
	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
82
54
	@echo
75
	sed -i 's/..\/..\//.\//g' _build/singlehtml/ubuntu-packaging-guide/index.html
83
55
	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
76
	sed -i 's/ubuntu-packaging-guide\/index/index/g' _build/singlehtml/ubuntu-packaging-guide/index.html
84
77
	mv $(BUILDDIR)/singlehtml/ubuntu-packaging-guide/*html  $(BUILDDIR)/singlehtml
85
78
	@echo
86
79
	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml/en"
87
80
singlehtml-%: locale
88
81
	$(SPHINXBUILD) -Dlanguage=$* -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml/$*
89
82
	# Work around upstream bug in singlehtml generation:
90
83
	# https://bitbucket.org/birkenfeld/sphinx/issue/892/broken-singlehtml-when-files-are-in
91
84
	sed -i 's/..\/..\//.\//g' _build/singlehtml/$*/ubuntu-packaging-guide/index.html
92
85
	sed -i 's/ubuntu-packaging-guide\/index/index/g' _build/singlehtml/$*/ubuntu-packaging-guide/index.html
93
86
	mv $(BUILDDIR)/singlehtml/$*/ubuntu-packaging-guide/*html  $(BUILDDIR)/singlehtml/$*
94
87
	@echo
95
88
	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml/$*."
96
56
89
97
57
pickle:
90
pickle:
98
58
	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
91
	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
99
@@ -88,51 +121,87 @@
100
88
	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ubuntu-packaging-guide"
121
	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ubuntu-packaging-guide"
101
89
	@echo "# devhelp"
122
	@echo "# devhelp"
102
90
123
104
91
epub:
124
epub: $(foreach lang,$(LANGS),epub-$(lang))
105
92
	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
125
	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
106
93
	@echo
126
	@echo
108
94
	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
127
	@echo "Build finished. The epub file is in $(BUILDDIR)/epub"
109
128
epub-%: locale
110
129
	$(SPHINXBUILD) -Dlanguage=$* -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$*
111
130
	@echo
112
131
	@echo "Build finished. The epub file is in $(BUILDDIR)/epub/$*."
113
95
132
115
96
latex:
133
latex: $(foreach lang,$(LANGS),latex-$(lang))
116
97
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
134
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
117
98
	@echo
135
	@echo
119
99
	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
136
	@echo "Build finished; the LaTeX files are in is in $(BUILDDIR)/epub/en"
120
137
	@echo "Run \`make' in that directory to run these through (pdf)latex" \
121
138
	      "(use \`make latexpdf' here to do that automatically)."
122
139
latex-%: locale
123
140
	$(SPHINXBUILD) -Dlanguage=$* -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$*
124
141
	@echo
125
142
	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$*."
126
100
	@echo "Run \`make' in that directory to run these through (pdf)latex" \
143
	@echo "Run \`make' in that directory to run these through (pdf)latex" \
127
101
	      "(use \`make latexpdf' here to do that automatically)."
144
	      "(use \`make latexpdf' here to do that automatically)."
128
102
145
130
103
latexpdf:
146
latexpdf: $(foreach lang,$(LANGS),latexpdf-$(lang))
131
104
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
147
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
132
105
	@echo "Running LaTeX files through pdflatex..."
148
	@echo "Running LaTeX files through pdflatex..."
133
106
	make -C $(BUILDDIR)/latex all-pdf
149
	make -C $(BUILDDIR)/latex all-pdf
158
107
	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
150
	mkdir -p $(BUILDDIR)/pdf; cp $(BUILDDIR)/latex/*pdf $(BUILDDIR)/pdf
159
108
151
	@echo "Build finished; the PDF files are in $(BUILDDIR)/pdf"
160
109
text:
152
latexpdf-%: locale
161
110
	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
153
	$(SPHINXBUILD) -Dlanguage=$* -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$*
162
111
	@echo
154
	@echo "Running LaTeX files through pdflatex..."
163
112
	@echo "Build finished. The text files are in $(BUILDDIR)/text."
155
	make -C $(BUILDDIR)/latex/$* all-pdf
164
113
156
	mkdir -p $(BUILDDIR)/pdf/$*; cp $(BUILDDIR)/latex/$*/*pdf $(BUILDDIR)/pdf/$*
165
114
man:
157
	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/pdf/$*."
166
115
	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
158
167
116
	@echo
159
text: $(foreach lang,$(LANGS),text-$(lang))
168
117
	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
160
	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text/en
169
118
161
	@echo
170
119
texinfo:
162
	@echo "Build finished. The text pages are in $(BUILDDIR)/text/en"
171
120
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
163
text-%: locale
172
121
	@echo
164
	$(SPHINXBUILD) -Dlanguage=$* -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text/$*
173
122
	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
165
	@echo
174
123
	@echo "Run \`make' in that directory to run these through makeinfo" \
166
	@echo "Build finished. The text files are in $(BUILDDIR)/text/$*."
175
124
	      "(use \`make info' here to do that automatically)."
167
176
125
168
man: $(foreach lang,$(LANGS),man-$(lang))
177
126
info:
169
	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man/en
178
127
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
170
	@echo
179
128
	@echo "Running Texinfo files through makeinfo..."
171
	@echo "Build finished. The manual pages are in $(BUILDDIR)/man/en"
180
129
	make -C $(BUILDDIR)/texinfo info
172
man-%: locale
181
130
	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
173
	$(SPHINXBUILD) -Dlanguage=$* -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man/$*
182
174
	@echo
183
175
	@echo "Build finished. The manual pages are in $(BUILDDIR)/man/$*."
184
176
185
177
texinfo: $(foreach lang,$(LANGS),texinfo-$(lang))
186
178
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo/en
187
179
	@echo
188
180
	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo/en."
189
181
	@echo "Run \`make' in that directory to run these through makeinfo" \
190
182
	      "(use \`make info' here to do that automatically)."
191
183
texinfo-%: locale
192
184
	$(SPHINXBUILD) -Dlanguage=$* -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo/$*
193
185
	@echo
194
186
	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo/$*."
195
187
	@echo "Run \`make' in that directory to run these through makeinfo" \
196
188
	      "(use \`make info' here to do that automatically)."
197
189
198
190
info: $(foreach lang,$(LANGS),info-$(lang))
199
191
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo/en
200
192
	@echo "Running Texinfo files through makeinfo..."
201
193
	make -C $(BUILDDIR)/texinfo/en info
202
194
	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo/en."
203
195
info-%: locale
204
196
	$(SPHINXBUILD) -Dlanguage=$* -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo/$*
205
197
	@echo "Running Texinfo files through makeinfo..."
206
198
	make -C $(BUILDDIR)/texinfo/$* info
207
199
	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo/$*."
208
131
200
209
132
gettext:
201
gettext:
211
133
	$(SPHINXBUILD) -b gettext $(ALLSPHINXOPTS) $(BUILDDIR)/locale
202
	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(PODIR)/
212
134
	@echo
203
	@echo
214
135
	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
204
	@echo "Build finished. The message catalogs are in $(PODIR)/."
215
136
205
216
137
changes:
206
changes:
217
138
	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
207
	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
218
@@ -149,3 +218,10 @@
219
149
	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
218
	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
220
150
	@echo "Testing of doctests in the sources finished, look at the " \
219
	@echo "Testing of doctests in the sources finished, look at the " \
221
151
	      "results in $(BUILDDIR)/doctest/output.txt."
220
	      "results in $(BUILDDIR)/doctest/output.txt."
222
221
223
222
locale: $(foreach lang,$(LANGS),locale-$(lang))
224
223
locale-%:
225
224
	@echo "Compiling .mo files in $(PODIR)/$*/LC_MESSAGES"
226
225
	mkdir -p $(PODIR)/$*/LC_MESSAGES
227
226
	msgfmt po/$*.po -o po/$*/LC_MESSAGES/ubuntu-packaging-guide.mo
228
227
229
152
228
230
=== modified file 'conf.py'
231
--- conf.py	2012-02-27 18:07:17 +0000
232
+++ conf.py	2012-03-20 20:48:20 +0000
233
@@ -21,7 +21,7 @@
234
21
# -- General configuration -----------------------------------------------------
21
# -- General configuration -----------------------------------------------------
235
22
22
236
23
# If your documentation needs a minimal Sphinx version, state it here.
23
# If your documentation needs a minimal Sphinx version, state it here.
238
24
#needs_sphinx = '1.0'
24
needs_sphinx = '1.1'
239
25
25
240
26
# Add any Sphinx extension module names here, as strings. They can be extensions
26
# Add any Sphinx extension module names here, as strings. They can be extensions
241
27
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
27
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
242
@@ -37,11 +37,12 @@
243
37
#source_encoding = 'utf-8-sig'
37
#source_encoding = 'utf-8-sig'
244
38
38
245
39
# The master toctree document.
39
# The master toctree document.
247
40
master_doc = 'index'
40
master_doc = 'ubuntu-packaging-guide/index'
248
41
41
249
42
# General information about the project.
42
# General information about the project.
250
43
project = u'ubuntu-packaging-guide'
43
project = u'ubuntu-packaging-guide'
252
44
copyright = u'2010, Ubuntu Developers'
44
authors = 'Ubuntu Developers'
253
45
copyright = u'2010-2012, '+authors
254
45
46
255
46
47
256
47
changelog = "debian/changelog"
48
changelog = "debian/changelog"
257
@@ -74,7 +75,8 @@
258
74
# directories to ignore when looking for source files.
75
# directories to ignore when looking for source files.
259
75
exclude_patterns = ['_build']
76
exclude_patterns = ['_build']
260
76
77
262
77
locale_dirs = ["translated/"]
78
locale_dirs = ["po/"]
263
79
gettext_compact = True
264
78
80
265
79
# The reST default role (used for this markup: `text`) to use for all documents.
81
# The reST default role (used for this markup: `text`) to use for all documents.
266
80
#default_role = None
82
#default_role = None
267
@@ -188,7 +190,7 @@
268
188
# Grouping the document tree into LaTeX files. List of tuples
190
# Grouping the document tree into LaTeX files. List of tuples
269
189
# (source start file, target name, title, author, documentclass [howto/manual]).
191
# (source start file, target name, title, author, documentclass [howto/manual]).
270
190
latex_documents = [
192
latex_documents = [
272
191
  ('index', 'ubuntu-packaging-guide.tex', u'ubuntu-packaging-guide Documentation',
193
  ('ubuntu-packaging-guide/index', 'ubuntu-packaging-guide.tex', u'ubuntu-packaging-guide Documentation',
273
192
   u'Ubuntu Developers', 'manual'),
194
   u'Ubuntu Developers', 'manual'),
274
193
]
195
]
275
194
196
276
@@ -221,7 +223,7 @@
277
221
# One entry per manual page. List of tuples
223
# One entry per manual page. List of tuples
278
222
# (source start file, name, description, authors, manual section).
224
# (source start file, name, description, authors, manual section).
279
223
man_pages = [
225
man_pages = [
281
224
    ('index', 'ubuntu-packaging-guide', u'ubuntu-packaging-guide Documentation',
226
    ('ubuntu-packaging-guide/index', 'ubuntu-packaging-guide', u'ubuntu-packaging-guide Documentation',
282
225
     [u'Ubuntu Developers'], 1)
227
     [u'Ubuntu Developers'], 1)
283
226
]
228
]
284
227
229
285
@@ -231,7 +233,7 @@
286
231
# (source start file, target name, title, author,
233
# (source start file, target name, title, author,
287
232
#  dir menu entry, description, category)
234
#  dir menu entry, description, category)
288
233
texinfo_documents = [
235
texinfo_documents = [
290
234
  ('index', 'ubuntu-packaging-guide', u'ubuntu-packaging-guide Documentation', u'Ubuntu Developers',
236
  ('ubuntu-packaging-guide/index', 'ubuntu-packaging-guide', u'ubuntu-packaging-guide Documentation', u'Ubuntu Developers',
291
235
   'ubuntu-packaging-guide', 'One line description of project.', 'Miscellaneous'),
237
   'ubuntu-packaging-guide', 'One line description of project.', 'Miscellaneous'),
292
236
]
238
]
293
237
239
294
@@ -242,10 +244,10 @@
295
242
# -- Options for Epub output ---------------------------------------------------
244
# -- Options for Epub output ---------------------------------------------------
296
243
245
297
244
# Bibliographic Dublin Core info.
246
# Bibliographic Dublin Core info.
302
245
epub_title = u'ubuntu-packaging-guide'
247
epub_title = project
303
246
epub_author = u'Ubuntu Developers'
248
epub_author = authors
304
247
epub_publisher = u'Ubuntu Developers'
249
epub_publisher = authors
305
248
epub_copyright = u'2010, Ubuntu Developers'
250
epub_copyright = copyright
306
249
251
307
250
# The language of the text. It defaults to the language option
252
# The language of the text. It defaults to the language option
308
251
# or en if the language is not set.
253
# or en if the language is not set.
309
252
254
310
=== modified file 'debian/control'
311
--- debian/control	2011-04-19 09:08:45 +0000
312
+++ debian/control	2012-03-20 20:48:20 +0000
313
@@ -3,7 +3,8 @@
314
3
Section: doc
3
Section: doc
315
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
316
5
Build-Depends: debhelper (>= 7.0.50~), python-sphinx (>= 1.0~), doc-base, 
5
Build-Depends: debhelper (>= 7.0.50~), python-sphinx (>= 1.0~), doc-base, 
318
6
 texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
6
 texlive-latex-base, texlive-latex-recommended, texlive-latex-extra,
319
7
 texlive-fonts-recommended, fdupes
320
7
Standards-Version: 3.9.1
8
Standards-Version: 3.9.1
321
8
9
322
9
Package: ubuntu-packaging-guide
10
Package: ubuntu-packaging-guide
323
10
11
324
=== modified file 'debian/copyright'
325
--- debian/copyright	2012-02-24 10:46:44 +0000
326
+++ debian/copyright	2012-03-20 20:48:20 +0000
327
@@ -4,7 +4,7 @@
328
4
Source: http://launchpad.net/ubuntu-packaging-guide
4
Source: http://launchpad.net/ubuntu-packaging-guide
329
5
5
330
6
Files: *
6
Files: *
332
7
Copyright: 2010-2011, Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
7
Copyright: 2010-2012, Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
333
8
License: CC-BY-SA-3.0
8
License: CC-BY-SA-3.0
334
9
 Attribution-ShareAlike 3.0 Unported
9
 Attribution-ShareAlike 3.0 Unported
335
10
 .
10
 .
336
11
11
337
=== modified file 'debian/rules'
338
--- debian/rules	2012-01-18 20:21:22 +0000
339
+++ debian/rules	2012-03-20 20:48:20 +0000
340
@@ -9,4 +9,17 @@
341
9
	make epub
9
	make epub
342
10
10
343
11
override_dh_compress:
11
override_dh_compress:
345
12
	dh_compress -X usr/share/doc/ubuntu-packaging-guide/html/_sources/
12
	dh_compress -X usr/share/doc/ubuntu-packaging-guide/html/
346
13
347
14
override_dh_link:
348
15
	# symlink identical resources.
349
16
	cd debian/ubuntu-packaging-guide && LC_ALL=C fdupes -r1nq \
350
17
	usr/share/doc/ubuntu-packaging-guide/html | while read s; do \
351
18
		set -- $$(echo $$s | tr ' ' '\n' | sort); \
352
19
		f=$$1; shift; \
353
20
		for d; do \
354
21
			echo "symlinking identical file $$f to $$d"; \
355
22
			rm $$f; ln -s /$$d $$f; \
356
23
		done; \
357
24
	done;
358
25
	dh_link
359
13
26
360
=== modified file 'debian/ubuntu-packaging-guide.doc-base.single'
361
--- debian/ubuntu-packaging-guide.doc-base.single	2010-11-19 12:02:45 +0000
362
+++ debian/ubuntu-packaging-guide.doc-base.single	2012-03-20 20:48:20 +0000
363
@@ -7,7 +7,7 @@
364
7
Section: Text
7
Section: Text
365
8
8
366
9
Format: PDF
9
Format: PDF
368
10
Files: /usr/share/doc/ubuntu-packaging-guide/ubuntu-packaging-guide.pdf.gz
10
Files: /usr/share/doc/ubuntu-packaging-guide/pdf/ubuntu-packaging-guide.pdf.gz
369
11
11
370
12
Format: HTML
12
Format: HTML
371
13
Index: /usr/share/doc/ubuntu-packaging-guide/singlehtml/index.html
13
Index: /usr/share/doc/ubuntu-packaging-guide/singlehtml/index.html
372
14
14
373
=== modified file 'debian/ubuntu-packaging-guide.docs'
374
--- debian/ubuntu-packaging-guide.docs	2010-11-19 12:02:45 +0000
375
+++ debian/ubuntu-packaging-guide.docs	2012-03-20 20:48:20 +0000
376
@@ -1,4 +1,4 @@
378
1
_build/latex/*.pdf
1
_build/pdf
379
2
_build/html
2
_build/html
380
3
_build/epub
3
_build/epub
381
4
_build/singlehtml
4
_build/singlehtml
382
5
5
383
=== added directory 'po'
384
=== added file 'po/de.po'
385
--- po/de.po	1970-01-01 00:00:00 +0000
386
+++ po/de.po	2012-03-20 20:48:20 +0000
387
@@ -0,0 +1,3182 @@
388
1
# SOME DESCRIPTIVE TITLE.
389
2
# Copyright (C) 2010-2012, Ubuntu Developers
390
3
# This file is distributed under the same license as the ubuntu-packaging-guide package.
391
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
392
5
#
393
6
#, fuzzy
394
7
msgid ""
395
8
msgstr ""
396
9
"Project-Id-Version: ubuntu-packaging-guide 0.1\n"
397
10
"Report-Msgid-Bugs-To: \n"
398
11
"POT-Creation-Date: 2012-02-29 17:52\n"
399
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
400
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
401
14
"Language-Team: LANGUAGE <LL@li.org>\n"
402
15
"MIME-Version: 1.0\n"
403
16
"Content-Type: text/plain; charset=UTF-8\n"
404
17
"Content-Transfer-Encoding: 8bit\n"
405
18
406
19
#: ../ubuntu-packaging-guide/chroots.rst:3
407
20
# d6c7ecbd606c4b9282b23708db85f9b5
408
21
msgid "Using Chroots"
409
22
msgstr "Chroots benutzen"
410
23
411
24
#: ../ubuntu-packaging-guide/chroots.rst:5
412
25
# c2a9180a73924eb0b652907be2585c5d
413
26
msgid "If you are running one version of Ubuntu but working on packages for another versions you can create the environment of the other version with a ``chroot``."
414
27
msgstr ""
415
28
416
29
#: ../ubuntu-packaging-guide/chroots.rst:9
417
30
# 6634399d63e843f4b72b0f770fafd076
418
31
msgid "A ``chroot`` allows you to have a full filesystem from another distribution which you can work in quite normally.  It avoids the overhead of running a full virtual machine."
419
32
msgstr ""
420
33
421
34
#: ../ubuntu-packaging-guide/chroots.rst:14
422
35
# feb922fa269d4d50913b3692dea2800f
423
36
msgid "Creating a Chroot"
424
37
msgstr ""
425
38
426
39
#: ../ubuntu-packaging-guide/chroots.rst:16
427
40
# 84f92237b55541a2b463749f2521ca05
428
41
msgid "Use the command ``debootstrap`` to create a new chroot::"
429
42
msgstr ""
430
43
431
44
#: ../ubuntu-packaging-guide/chroots.rst:20
432
45
# 9208c7dbf8d84b5eb0fd24fab308ff5c
433
46
msgid "This will create a directory ``oneiric`` and install a minimal oneiric system into it."
434
47
msgstr ""
435
48
436
49
#: ../ubuntu-packaging-guide/chroots.rst:23
437
50
# 2f24711099184a0ba8f80c20edc1adc2
438
51
msgid "If your version of ``debootstrap`` does not know about oneiric you can try upgrading to the version in ``backports``."
439
52
msgstr ""
440
53
441
54
#: ../ubuntu-packaging-guide/chroots.rst:26
442
55
# 0575a501ac4448359c69b30b55550435
443
56
msgid "You can then work inside the chroot::"
444
57
msgstr ""
445
58
446
59
#: ../ubuntu-packaging-guide/chroots.rst:30
447
60
# 6b1f042f6de1476db33347866860441c
448
61
msgid "Where you can install or remove any package you wish without affecting your main system."
449
62
msgstr ""
450
63
451
64
#: ../ubuntu-packaging-guide/chroots.rst:33
452
65
# 9536d8f2c01e43648648496a446eeb6e
453
66
msgid "You might want to copy your GPG/ssh keys and Bazaar configuration into the chroot so you can access and sign packages directly."
454
67
msgstr ""
455
68
456
69
#: ../ubuntu-packaging-guide/chroots.rst:36
457
70
# e6d516f40fee4cc2972525ec9b13615e
458
71
msgid "$ sudo mkdir oneiric/home/<username> $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar oneiric/home/<username>"
459
72
msgstr ""
460
73
461
74
#: ../ubuntu-packaging-guide/chroots.rst:39
462
75
# ed82e18debb24933ad3b49492b196442
463
76
msgid "To stop apt and other programs complaining about missing locales you can install your relevant language pack::"
464
77
msgstr ""
465
78
466
79
#: ../ubuntu-packaging-guide/chroots.rst:44
467
80
# 7d9703bd6d9148daa5980a104d8d13ef
468
81
msgid "If you want to run X programs you will need to bind the /tmp directory into the chroot, from outside the chroot run::"
469
82
msgstr ""
470
83
471
84
#: ../ubuntu-packaging-guide/chroots.rst:50
472
85
# 3c056ca4d3b54c53bca74c2cc2025835
473
86
msgid "Some programs may need you to bind /dev or /proc."
474
87
msgstr ""
475
88
476
89
#: ../ubuntu-packaging-guide/chroots.rst:52
477
90
# 7164d56709d64a9e83edc09bf710fce7
478
91
msgid "For more information on chroots see our `Debootstrap Chroot wiki page`_."
479
92
msgstr ""
480
93
481
94
#: ../ubuntu-packaging-guide/chroots.rst:55
482
95
# 26aacfbeebe4473f9e1244c3c974b6ff
483
96
msgid "Alternatives"
484
97
msgstr "Alternativen"
485
98
486
99
#: ../ubuntu-packaging-guide/chroots.rst:57
487
100
# f085504840904fcb995131456d3036d7
488
101
msgid "SBuild is a system similar to PBuilder for creating an environment to run test package builds in.  It closer matches that used by Launchpad for building packages but takes some more setup compared to PBuilder.  See `the Security Team Build Environment wiki page`_ for a full explanation."
489
102
msgstr ""
490
103
491
104
#: ../ubuntu-packaging-guide/chroots.rst:59
492
105
# 9fa7e581df034a33a4503a7a41b37017
493
106
msgid "Full virtual machines can be useful for packaging and testing programmes.  TestDrive is a program to automate syncing and running daily ISO images, see `the TestDrive wiki page`_ for more information."
494
107
msgstr ""
495
108
496
109
#: ../ubuntu-packaging-guide/chroots.rst:63
497
110
# 112cec755e0d4ac5a0e1e20df59807f8
498
111
msgid "You can also set up pbuilder to pause when it comes across a build failure.  Copy C10shell from /usr/share/doc/pbuilder/examples into a directory and use the --hookdir= argument to point to it."
499
112
msgstr ""
500
113
501
114
#: ../ubuntu-packaging-guide/chroots.rst:67
502
115
# 1367b95423434ae9b8d2687c8c100771
503
116
msgid "Amazon's `EC2 cloud computers`_ allow you to hire a computer paying a few US cents per hour, you can set up Ubuntu machines of any supported version and package on those.  This is useful when you want to compile many packages at the same time or to overcome bandwidth restraints."
504
117
msgstr ""
505
118
506
119
#: ../ubuntu-packaging-guide/communication.rst:3
507
120
# 607298b09c134c8497b9dd820a18456f
508
121
msgid "Communication in Ubuntu Development"
509
122
msgstr ""
510
123
511
124
#: ../ubuntu-packaging-guide/communication.rst:5
512
125
# 02e7427cdd1a4e48b9f0dfa256715944
513
126
msgid "In a project where thousands of lines of code are changed, lots of decisions are made and hundreds of people interact every day, it is important to communicate effectively."
514
127
msgstr ""
515
128
516
129
#: ../ubuntu-packaging-guide/communication.rst:10
517
130
# 8dff4e5170734f698bbb51c6807b7dcf
518
131
msgid "Mailing lists"
519
132
msgstr "Mailinglisten"
520
133
521
134
#: ../ubuntu-packaging-guide/communication.rst:12
522
135
# 7bdd3f8f13b34307a06a05656c94760b
523
136
msgid "Mailing lists are a very important tool if you want to communicate ideas to a broader team and make sure that you reach everybody, even across timezones."
524
137
msgstr ""
525
138
526
139
#: ../ubuntu-packaging-guide/communication.rst:16
527
140
# ec54a70a969342e58399443508c91e33
528
141
msgid "In terms of development, these are the most important ones:"
529
142
msgstr ""
530
143
531
144
#: ../ubuntu-packaging-guide/communication.rst:18
532
145
# c583284d21a5478e973448d96344c720
533
146
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-announce (announce-only, the most important development announcements go here)"
534
147
msgstr ""
535
148
536
149
#: ../ubuntu-packaging-guide/communication.rst:20
537
150
# 187731122f5045a09748d70e00456b4c
538
151
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel (general Ubuntu development discussion)"
539
152
msgstr ""
540
153
541
154
#: ../ubuntu-packaging-guide/communication.rst:22
542
155
# 38f45dd72cfd4f64bc0e64af440c45c2
543
156
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu (MOTU Team discussion, get help with packaging)"
544
157
msgstr ""
545
158
546
159
#: ../ubuntu-packaging-guide/communication.rst:27
547
160
# bcf8bf4cfd7d44e79964fc504e3dcbcf
548
161
msgid "IRC Channels"
549
162
msgstr "IRC-Kanäle"
550
163
551
164
#: ../ubuntu-packaging-guide/communication.rst:29
552
165
# 1640a1e73721469dbb00fb44535008f2
553
166
msgid "For real-time discussions, please connect to irc.freenode.net and join one or any of these channels:"
554
167
msgstr ""
555
168
556
169
#: ../ubuntu-packaging-guide/communication.rst:32
557
170
# 54b7cb96eed649698da71070bdcec51b
558
171
msgid "#ubuntu-devel (for general development discussion)"
559
172
msgstr ""
560
173
561
174
#: ../ubuntu-packaging-guide/communication.rst:33
562
175
# 9d87672ae32043ec8c0a9f2bca0b7dd4
563
176
msgid "#ubuntu-motu (for MOTU team discussion and generally getting help)"
564
177
msgstr ""
565
178
566
179
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:2
567
180
# 89800d29a2d548768207920d6fb6d7b3
568
181
msgid "Basic Overview of the ``debian/`` Directory"
569
182
msgstr ""
570
183
571
184
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:4
572
185
# 7d1e060c05644770b508535c347508a1
573
186
msgid "This article will briefly explain the different files important to the packaging of Ubuntu packages which are contained in the ``debian/`` directory. The most important of them are ``changelog``, ``control``, ``copyright``, and ``rules``. These are required for all packages. A number of additional files in the ``debian/`` may be used in order to customize and configure the behavior of the package. Some of these files are discussed in this article, but this is not meant to be a complete list."
574
187
msgstr ""
575
188
576
189
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:13
577
190
# 3021836f0c23449690b60757ce61172a
578
191
msgid "The changelog"
579
192
msgstr ""
580
193
581
194
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:15
582
195
# 31bd62153b0d408bb34738128c941836
583
196
msgid "This file is, as its name implies, a listing of the changes made in each version. It has a specific format that gives the package name, version, distribution, changes, and who made the changes at a given time. If you have a GPG key (see: :doc:`Getting set up<./getting-set-up/>`), make sure to use the same name and email address in ``changelog`` as you have in your key. The following is a template ``changelog``::"
584
197
msgstr ""
585
198
586
199
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:31
587
200
# 615d3cedb82c4d399c625d3986b6c75e
588
201
msgid "The format (especially of the date) is important. The date should be in :rfc:`5322` format, which can be obtained by using the command ``date -R``. For convenience, the command ``dch`` may be used to edit changelog. It will update the date automatically."
589
202
msgstr ""
590
203
591
204
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:36
592
205
# 3d1b93961c0a46a4b77382e11822dd08
593
206
msgid "Minor bullet points are indicated by a dash \"-\", while major points use an asterisk \"*\"."
594
207
msgstr ""
595
208
596
209
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:39
597
210
# 3c8e29b2b199417083f23153de4c94c4
598
211
msgid "If you are packaging from scratch, ``dch --create`` (``dch`` is in the ``devscripts`` package) will create a standard ``debian/changelog`` for you."
599
212
msgstr ""
600
213
601
214
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:43
602
215
# 0f6505553bb0491d9f0247c37f87cf9a
603
216
msgid "Here is a sample ``changelog`` file for hello::"
604
217
msgstr ""
605
218
606
219
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:52
607
220
# 3f1fd2f3b89a4e36aff77a170ba8c656
608
221
msgid "Notice that the version has a ``-0ubuntu1`` appended to it, this is the distro revision, used so that the packaging can be updated (to fix bugs for example) with new uploads within the same source release version."
609
222
msgstr ""
610
223
611
224
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:56
612
225
# 8500e33e8dae496d9bab351d1f1f0a0d
613
226
msgid "Ubuntu and Debian have slightly different package versioning schemes to avoid conflicting packages with the same source version. If a Debian package has been changed in Ubuntu, it has ``ubuntuX`` (where ``X`` is the Ubuntu revision number) appended to the end of the Debian version. So if the Debian hello ``2.6-1`` package was changed by Ubuntu, the version string would be ``2.6-1ubuntu1``. If a package for the application does not exist in Debian, then the Debian revision is ``0`` (e.g. ``2.6-0ubuntu1``)."
614
227
msgstr ""
615
228
616
229
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:64
617
230
# 8a1028b5e61244339a21d8fdf991cd73
618
231
msgid "For further information, see the `changelog section (Section 4.4) <http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog>`_ of the Debian Policy Manual."
619
232
msgstr ""
620
233
621
234
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:70
622
235
# 552ad1faf3814524bd838abbb1c6dfde
623
236
msgid "The control file"
624
237
msgstr ""
625
238
626
239
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:72
627
240
# 0a7a9cd926a5482090b334ae4eb5fa76
628
241
msgid "The ``control`` file contains the information that the package manager (such as ``apt-get``, ``synaptic``, and ``adept``) uses, build-time dependencies, maintainer information, and much more."
629
242
msgstr ""
630
243
631
244
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:76
632
245
# 2c2caa9a9fef495dad29ffa07ab52d4a
633
246
msgid "For the Ubuntu ``hello`` package, the ``control`` file looks something like::"
634
247
msgstr ""
635
248
636
249
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:99
637
250
# bd3ddeb9c3fd445ba6df546d419ec391
638
251
msgid "The first paragraph describes the source package including the list of packages required to build the package from source in the ``Build-Depends`` field. It also contains some meta-information such as the maintainer's name, the version of Debian Policy that the package complies with, the location of the packaging version control repository, and the upstream home page."
639
252
msgstr ""
640
253
641
254
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:106
642
255
# 93b0eec4843d4f819ba16118070fbbdf
643
256
msgid "Note that in Ubuntu, we set the ``Maintainer`` field to a general address because anyone can change any package (this differs from Debian where changing packages is usually restricted to an individual or a team). Packages in Ubuntu should generally have the ``Maintainer`` field set to ``Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>``. If the Maintainer field is modified, the old value should be saved in the ``XSBC-Original-Maintainer`` field. This can be done automatically with the  ``update-maintainer`` script available in the ``ubuntu-dev-tools`` package. For further information, see the `Debian Maintainer Field spec <https://wiki.ubuntu.com/DebianMaintainerField>`_ on the Ubuntu wiki."
644
257
msgstr ""
645
258
646
259
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:118
647
260
# 00ca42e43f314557af47bf373ae50fe6
648
261
msgid "Each additional paragraph describes a binary package to be built."
649
262
msgstr ""
650
263
651
264
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:120
652
265
# a48f51f0912a4312a904ab5f40ced13d
653
266
msgid "For further information, see the `control file section (Chapter 5) <http://www.debian.org/doc/debian-policy/ch-controlfields.html>`_ of the Debian Policy Manual."
654
267
msgstr ""
655
268
656
269
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:126
657
270
# 870ce0ac216c4fd8a10aa642d5a8ee12
658
271
msgid "The copyright file"
659
272
msgstr "Die Copyright-Datei"
660
273
661
274
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:128
662
275
# a8f880bcb0174968b217b52dfc303a34
663
276
msgid "This file gives the copyright information for both the upstream source and the packaging. Ubuntu and `Debian Policy (Section 12.5) <http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile>`_ require that each package installs a verbatim copy of its copyright and license information to ``/usr/share/doc/$(package_name)/copyright``."
664
277
msgstr ""
665
278
666
279
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:134
667
280
# 73c9109a50ce4e2c8d6ce22c64df57dd
668
281
msgid "Generally, copyright information is found in the ``COPYING`` file in the program's source directory. This file should include such information as the names of the author and the packager, the URL from which the source came, a Copyright line with the year and copyright holder, and the text of the copyright itself. An example template would be::"
669
282
msgstr ""
670
283
671
284
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:176
672
285
# 7a2e84d5a9304d2fb327fc2d39a75a45
673
286
msgid "This example follows the `Machine-readable debian/copyright <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>`_ format. You are encouraged to use this format as well."
674
287
msgstr ""
675
288
676
289
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:182
677
290
# 7c0fe27bc8fa4cb192be460e57dde489
678
291
msgid "The rules file"
679
292
msgstr ""
680
293
681
294
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:184
682
295
# 7c9e2edb563c4fe894feeae0b17007c7
683
296
msgid "The last file we need to look at is ``rules``. This does all the work for creating our package. It is a Makefile with targets to compile and install the application, then create the ``.deb`` file from the installed files. It also has a target to clean up all the build files so you end up with just a source package again."
684
297
msgstr ""
685
298
686
299
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:192
687
300
# 299ff74602f94f758774713d29895440
688
301
msgid "Here is a simplified version of the rules file created by ``dh_make`` (which can be found in the ``dh-make`` package)::"
689
302
msgstr ""
690
303
691
304
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:204
692
305
# 94a7b044a9824b13b733ffe6b5ee57b5
693
306
msgid "Let us go through this file in some detail. What this does is pass every build target that ``debian/rules`` is called with as an argument to ``/usr/bin/dh``, which itself will call all the necessary ``dh_*`` commands."
694
307
msgstr ""
695
308
696
309
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:208
697
310
# de59039f8bd245d7971edf916d93a839
698
311
msgid "``dh`` runs a sequence of debhelper commands. The supported sequences correspond to the targets of a ``debian/rules`` file: \"build\", \"clean\", \"install\", \"binary-arch\", \"binary-indep\", and \"binary\". In order to see what commands are run in each target, run::"
699
312
msgstr ""
700
313
701
314
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:217
702
315
# 7d39368e13994bedac97c6e43018bbb2
703
316
msgid "Commands in the binary-indep sequence are passed the \"-i\" option to ensure they only work on binary independent packages, and commands in the binary-arch sequences are passed the \"-a\" option to ensure they only work on architecture dependent packages."
704
317
msgstr ""
705
318
706
319
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:222
707
320
# 9aeaa267814c4f199174eb45833f25c2
708
321
msgid "Each debhelper command will record when it's successfully run in ``debian/package.debhelper.log``. (Which dh_clean deletes.) So dh can tell which commands have already been run, for which packages, and skip running those commands again."
709
322
msgstr ""
710
323
711
324
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:227
712
325
# efa044d38ff14eebb1b18fab6a0d594d
713
326
msgid "Each time ``dh`` is run, it examines the log, and finds the last logged command that is in the specified sequence. It then continues with the next command in the sequence. The ``--until``, ``--before``, ``--after``, and ``--remaining`` options can override this behavior."
714
327
msgstr ""
715
328
716
329
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:232
717
330
# d01ecd38632646f4b2bbaf1c8a08477d
718
331
msgid "If ``debian/rules`` contains a target with a name like ``override_dh_command``, then when it gets to that command in the sequence, ``dh`` will run that target from the rules file, rather than running the actual command. The override target can then run the command with additional options, or run entirely different commands instead. (Note that to use this feature, you should Build-Depend on debhelper 7.0.50 or above.)"
719
332
msgstr ""
720
333
721
334
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:241
722
335
# 3f4e235a68754876866310c506863f75
723
336
msgid "Have a look at ``/usr/share/doc/debhelper/examples/`` and ``man dh`` for more examples. Also see `the rules section (Section 4.9) <http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules>`_ of the Debian Policy Manual."
724
337
msgstr ""
725
338
726
339
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:247
727
340
# 909152843c7c41ffa14664f13cb0e23f
728
341
msgid "Additional Files"
729
342
msgstr "Zusätzliche Dateien"
730
343
731
344
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:250
732
345
# f6ef0e8b2e5149f59850c2425711b97f
733
346
msgid "The install file"
734
347
msgstr ""
735
348
736
349
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:252
737
350
# 526e3303d4d44e27a3ceefc4764a54c9
738
351
msgid "The ``install`` file is used by ``dh_install`` to install files into the binary package. It has two standard use cases:"
739
352
msgstr ""
740
353
741
354
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:255
742
355
# 8f1de6bb1994494b807ec69b3af9e2ff
743
356
msgid "To install files into your package that are not handled by the upstream build system."
744
357
msgstr ""
745
358
746
359
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:256
747
360
# ecb71f5a256c4c0ab18dd78194054e68
748
361
msgid "Splitting a single large source package into multiple binary packages."
749
362
msgstr ""
750
363
751
364
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:258
752
365
# b540bec3330242b48b8b6c6f34cfacf6
753
366
msgid "In the first case, the ``install`` file should have one line per file installed, specifying both the the file and the installation directory. For example, the following ``install`` file would install the script ``foo`` in the source package's root directory to ``usr/bin`` and a desktop file in the ``debian`` directory to ``usr/share/applications``::"
754
367
msgstr ""
755
368
756
369
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:269
757
370
# cdd19fc100104c8ea9f0588252dfa8cb
758
371
msgid "When a source package is producing multiple binary packages ``dh`` will install the files into ``debian/tmp`` rather than directly into ``debian/<package>``. Files installed into ``debian/tmp`` can then be moved into separate binary packages using multiple ``$package_name.install`` files. This is often done to split large amounts of architecture independent data out of architecture dependent packages and into ``Architecture: all`` packages. In this case, only the name of the files (or directories) to be installed are needed without the installation directory. For example, ``foo.install`` containing only the architecture dependent files might look like::"
759
372
msgstr ""
760
373
761
374
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:282
762
375
# 490646dff688435088bd93ff30de6a8a
763
376
msgid "While ``foo-common.install`` containing only the architecture independent file might look like::"
764
377
msgstr ""
765
378
766
379
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:290
767
380
# ad5ae2bd9270403fb9916024351646c9
768
381
msgid "This would create two binary packages, ``foo`` and ``foo-common``. Both would require their own paragraph in ``debian/control``."
769
382
msgstr ""
770
383
771
384
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:293
772
385
# ed10a77119a6408b8a5f7bfebc53500e
773
386
msgid "See ``man dh_install`` and the `install file section (Section 5.11) <http://www.debian.org/doc/manuals/maint-guide/dother.en.html#install>`_  of the Debian New Maintainers' Guide for additional details."
774
387
msgstr ""
775
388
776
389
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:298
777
390
# 2bce7b3f508c457eb566c77de679acd7
778
391
msgid "The watch file"
779
392
msgstr ""
780
393
781
394
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:300
782
395
# d22412241e7349bfa19c0ca46d59fa93
783
396
msgid "The ``debian/watch`` file allows us to check automatically for new upstream versions using the tool ``uscan`` found in the ``devscripts`` package. The first line of the watch file must be the format version (3, at the time of this writing), while the following lines contain any URLs to parse. For example::"
784
397
msgstr ""
785
398
786
399
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:309
787
400
# 3fd98ffeb19c4a2290a8fec31eed399c
788
401
msgid "Running ``uscan`` in the root source directory will now compare the upstream version number in ``debian/changelog`` with the latest available upstream version. If a new upstream version is found, it will be automatically downloaded. For example::"
789
402
msgstr ""
790
403
791
404
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:322
792
405
# a4a1f7731ea6433ca39eecbd57af3120
793
406
msgid "For further information, see ``man uscan`` and the `watch file section (Section 4.11) <http://www.debian.org/doc/debian-policy/ch-source.html#s-debianwatch>`_ of the Debian Policy Manual."
794
407
msgstr ""
795
408
796
409
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:326
797
410
# 703b5d062b5c41e5a60cf8801b69b893
798
411
msgid "For a list of packages where the ``watch`` file reports they are not in sync with upstream see `Ubuntu External Health Status <http://qa.ubuntuwire.org/uehs/no_updated.html>`_."
799
412
msgstr ""
800
413
801
414
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:331
802
415
# faa634aa8992448d86ad70c8669ceee1
803
416
msgid "The source/format file"
804
417
msgstr "Die Datei source/format"
805
418
806
419
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:333
807
420
# a348a6a009424e0fa49a866e129573a2
808
421
msgid "This file indicates the format of the source package. It should contain a single line indicating the desired format:"
809
422
msgstr ""
810
423
811
424
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:336
812
425
# 3d75a73a1fcd4342ab1fe865edf49644
813
426
msgid "``3.0 (native)`` for Debian native packages (no upstream version)"
814
427
msgstr ""
815
428
816
429
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:338
817
430
# fd11f4ebad4d45bcbac715f3d8d4cc92
818
431
msgid "``3.0 (quilt)`` for packages with a separate upstream tarball"
819
432
msgstr ""
820
433
821
434
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:340
822
435
# 1293ceef3ce04d30b640542aec2b476c
823
436
msgid "``1.0`` for packages wishing to explicitly declare the default format"
824
437
msgstr ""
825
438
826
439
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:342
827
440
# 4e5d823b97ab4704aba10fb129ed0106
828
441
msgid "Currently, the package source format will default to 1.0 if this file does not exist. You can make this explicit in the source/format file. If you choose not to use this file to define the source format, Lintian will warn about the missing file. This warning is informational only and may be safely ignored."
829
442
msgstr ""
830
443
831
444
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:347
832
445
# d7047d3e7c22489baedfec02eea21f25
833
446
msgid "You are encouraged to use the newer 3.0 source format. It provides a number of new features:"
834
447
msgstr ""
835
448
836
449
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:350
837
450
# bc4e7971f98848ae9f1fb3fd8ee97ace
838
451
msgid "Support for additional compression formats: bzip2, lzma and xz"
839
452
msgstr ""
840
453
841
454
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:352
842
455
# ddca8f575fac40e09adebd6d128ff676
843
456
msgid "Support for multiple upstream tarballs"
844
457
msgstr ""
845
458
846
459
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:354
847
460
# aded08ffbdb7449d88dd6010fd97766f
848
461
msgid "Not necessary to repack the upstream tarball to strip the debian directory"
849
462
msgstr ""
850
463
851
464
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:356
852
465
# b0f4d5d0c68e47de9ed8836f20a0e8be
853
466
msgid "Debian-specific changes are no longer stored in a single .diff.gz but in multiple patches compatible with quilt under ``debian/patches/``"
854
467
msgstr ""
855
468
856
469
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:358
857
470
# 39b0c8ccca7e48b7af1af09d580e9f58
858
471
msgid "http://wiki.debian.org/Projects/DebSrc3.0 summarizes additional information concerning the switch to the 3.0 source package formats."
859
472
msgstr ""
860
473
861
474
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:361
862
475
# 9d2f31ea080c47109ce2cdae3e87f14b
863
476
msgid "See ``man dpkg-source`` and the `source/format section (Section 5.21) <http://www.debian.org/doc/manuals/maint-guide/dother.en.html#sourcef>`_  of the Debian New Maintainers' Guide for additional details."
864
477
msgstr ""
865
478
866
479
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:366
867
480
# 62fbf7d7bdcb49e782e64f2623b6f273
868
481
msgid "Additional Resources"
869
482
msgstr ""
870
483
871
484
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:368
872
485
# 039aa564015a48bda02c00b97d1ae2f3
873
486
msgid "In addition to the links to the Debian Policy Manual in each section above, the Debian New Maintainers' Guide has more detailed descriptions of each file. `Chapter 4, \"Required files under the debian directory\" <http://www.debian.org/doc/maint-guide/dreq.en.html>`_ further discusses the control, changelog, copyright and rules files. `Chapter 5, \"Other files under the debian directory\" <http://www.debian.org/doc/maint-guide/dother.en.html>`_ discusses additional files that may be used."
874
487
msgstr ""
875
488
876
489
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:3
877
490
# 4be28eeaaecb4fffa9bcfb62c8828b58
878
491
msgid "Fixing a bug in Ubuntu"
879
492
msgstr ""
880
493
881
494
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:6
882
495
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:9
883
496
# 5973d64df73b4f8593c75fcac478a00e
884
497
# e0956744ffbc47c08a5bb87b139bb113
885
498
msgid "Introduction"
886
499
msgstr ""
887
500
888
501
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:8
889
502
# d4425948fa1e4b4fa3552113dc4dd00d
890
503
msgid "If you followed the instructions to :doc:`get set up with Ubuntu Development<./getting-set-up>`, you should be all set and ready to go."
891
504
msgstr ""
892
505
893
506
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:11
894
507
# 02b036432f59412c82aed419f79fdb8c
895
508
msgid "..image:: |IMG|fixing-a-bug.png"
896
509
msgstr ""
897
510
898
511
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:13
899
512
# 565e30b78a5c41b8990814dc8aaf9193
900
513
msgid "As you can see in the image above, there is no surprises in the process of fixing bugs in Ubuntu: you found a problem, you get the code, work on the fix, test it, push your changes to Launchpad and ask for it to be reviewed and merged. In this guide we will go through all the necessary steps one by one."
901
514
msgstr ""
902
515
903
516
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:20
904
517
# 65a1fad6a3d04bbf8fc8932a8dbf6061
905
518
msgid "Finding the problem"
906
519
msgstr ""
907
520
908
521
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:22
909
522
# e8e70d62917543ed8b9b8f081ba09518
910
523
msgid "There are a lot of different ways to find things to work on. It might be a bug report you are encountering yourself (which gives you a good opportunity to test the fix), or a problem you noted elsewhere, maybe in a bug report."
911
524
msgstr ""
912
525
913
526
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:26
914
527
# 1c114b6ed4044179acbfa298d17e8687
915
528
msgid "`Harvest <http://harvest.ubuntu.com/>`_ is where we keep track of various TODO lists regarding Ubuntu development. It lists bugs that were fixed upstream or in Debian already, lists small bugs (we call them 'bitesize'), and so on. Check it out and find your first bug to work on."
916
529
msgstr ""
917
530
918
531
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:35
919
532
# b454c63458594749aa09f9e587ed24a7
920
533
msgid "Figuring out what to fix"
921
534
msgstr ""
922
535
923
536
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:37
924
537
# e80c8c6721fe41ddb9d3976bea810f18
925
538
msgid "If you don't know the source package containing the code that has the problem, but you do know the path to the affected program on your system, you can discover the source package that you'll need to work on."
926
539
msgstr ""
927
540
928
541
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:41
929
542
# 4726f96b219c4bfeb111d18b723e771e
930
543
msgid "Let's say you've found a bug in Tomboy, a note taking desktop application. The Tomboy application can be started by running ``/usr/bin/tomboy`` on the command line.  To find the binary package containing this application, use this command::"
931
544
msgstr ""
932
545
933
546
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:48
934
547
# dbf4f211a56f4f79b15bf42c6a835050
935
548
msgid "This would print out::"
936
549
msgstr ""
937
550
938
551
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:52
939
552
# 682b18dbdfe142d2affc3e04e843783f
940
553
msgid "Note that the part preceding the colon is the binary package name.  It's often the case that the source package and binary package will have different names. This is most common when a single source package is used to build multiple different binary packages.  To find the source package for a particular binary package, type::"
941
554
msgstr ""
942
555
943
556
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:64
944
557
# b7321dfe18ed434689e1617b5ad1b575
945
558
msgid "Getting the code"
946
559
msgstr ""
947
560
948
561
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:66
949
562
# a88040229e1343e3a881389f2388861f
950
563
msgid "Once you know the source package to work on, you will want to get a copy of the code on your system, so that you can debug it.  In Ubuntu Distributed Development this is done by :ref:`*branching* the source package <branching>` branch corresponding to the source package.  Launchpad maintains source package branches for all the packages in Ubuntu."
951
564
msgstr ""
952
565
953
566
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:72
954
567
# 92bb0cef4a5a4924afaff6a5bd97394f
955
568
msgid "Once you've got a local branch of the source package, you can investigate the bug, create a fix, and upload your proposed fix to Launchpad, in the form of a Bazaar branch.  When you are happy with your fix, you can :ref:`submit a *merge proposal* <merge-proposal>`, which asks other Ubuntu developers to review and approve your change.  If they agree with your changes, an Ubuntu developer will upload the new version of the package to Ubuntu so that everyone gets the benefit of your excellent fix - and you get a little bit of credit.  You're now on your way to becoming an Ubuntu developer!"
956
569
msgstr ""
957
570
958
571
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:81
959
572
# 18ebcba0d9804cdcbd3d7b679124afba
960
573
msgid "We'll describe specifics on how to branch the code, push your fix, and request a review in the following sections."
961
574
msgstr ""
962
575
963
576
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:86
964
577
# e8950446f9d643f9a88454cb13406165
965
578
msgid "Work on a fix"
966
579
msgstr ""
967
580
968
581
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:88
969
582
# 0b597e2df21d4ffb9082682062b35f5b
970
583
msgid "There are entire books written about finding bugs, fixing them, testing them, etc. If you are completely new to programming, try to fix easy bugs such as obvious typos first. Try to keep changes as minimal as possible and document your change and assumptions clearly."
971
584
msgstr ""
972
585
973
586
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:93
974
587
# 1cad1f33d073486abd5bbd7950da19e1
975
588
msgid "Before working on a fix yourself, make sure to investigate if nobody else has fixed it already or is currently working on a fix. Good sources to check are:"
976
589
msgstr ""
977
590
978
591
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:96
979
592
# 9cd02b0b46194cb0a6e1c024c73d67bb
980
593
msgid "Upstream (and Debian) bug tracker (open and closed bugs),"
981
594
msgstr ""
982
595
983
596
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:97
984
597
# fe3658bb50d6453d839bae201ab3e0d3
985
598
msgid "Upstream revision history (or newer release) might have fixed the problem,"
986
599
msgstr ""
987
600
988
601
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:98
989
602
# dc982aac83c44804b15e226836d039fd
990
603
msgid "bugs or package uploads of Debian or other distributions."
991
604
msgstr ""
992
605
993
606
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:103
994
607
# 3d5234f7f891414eac096bc475484247
995
608
msgid "You now want to create a patch which includes the fix.  The command ``edit-patch`` is a simple way to add a patch to a package. Run::"
996
609
msgstr ""
997
610
998
611
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:108
999
612
# e09e4812312c4fdc854bd3814b092ebb
1000
613
msgid "This will copy the packaging to a temporary directory.  You can now edit files with a text editor or apply patches from upstream, for example::"
1001
614
msgstr ""
1002
615
1003
616
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:113
1004
617
# 8e00895b4bf64119869e26ce978cb55b
1005
618
msgid "After editing the file type ``exit`` or press ``control-d`` to quit the temporary shell.  The new patch will have been added into ``debian/patches``."
1006
619
msgstr ""
1007
620
1008
621
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:118
1009
622
# a5e56006a7db42a2b5b976f351e1a93a
1010
623
msgid "Testing the fix"
1011
624
msgstr ""
1012
625
1013
626
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:120
1014
627
# 29f45bb94cae448f9ff6bd53897237ab
1015
628
msgid "To build a test package with your changes, run these commands::"
1016
629
msgstr ""
1017
630
1018
631
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:125
1019
632
# 6fd80448fb9b40668a73b68d9aa82ee9
1020
633
msgid "This will create a source package from the branch contents (``-us -uc`` will just omit the step to sign the source package) and ``pbuilder-dist`` will build the package from source for whatever ``release`` you choose."
1021
634
msgstr ""
1022
635
1023
636
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:129
1024
637
# 7064dcf9f1ae4f49bacc8b5ebb79a4fb
1025
638
msgid "Once the build succeeds, install the package from ``~/pbuilder/<release>_result/`` (using ``sudo dpkg -i <package>_<version>.deb``).  Then test to see if the bug is fixed."
1026
639
msgstr ""
1027
640
1028
641
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:136
1029
642
# a498c34018d44bc083c421d3836bc292
1030
643
msgid "Documenting the fix"
1031
644
msgstr ""
1032
645
1033
646
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:138
1034
647
# 284aad9da256489bb9541ef9c9ed8050
1035
648
msgid "It is very important to document your change sufficiently so developers who look at the code in the future won't have to guess what your reasoning was and what your assumptions were. Every Debian and Ubuntu package source includes ``debian/changelog``, where changes of each uploaded package are tracked."
1036
649
msgstr ""
1037
650
1038
651
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:143
1039
652
# c560a925fc79452f85c60a462422febd
1040
653
msgid "The easiest way to update this is to run::"
1041
654
msgstr ""
1042
655
1043
656
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:147
1044
657
# fc6305e6f22b4bbe8f7ae46d9d2d36fe
1045
658
msgid "This will add a boilerplate changelog entry for you and launch an editor where you can fill in the blanks. An example of this could be::"
1046
659
msgstr ""
1047
660
1048
661
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:156
1049
662
# b4fcf5a54df94852b901b81d99177166
1050
663
msgid "``dch`` should fill out the first and last line of such a changelog entry for you already. Line 1 consists of the source package name, the version number, which Ubuntu release it is uploaded to, the urgency (which almost always is 'low'). The last line always contains the name, email address and timestamp (in :rfc:`5322` format) of the change."
1051
664
msgstr ""
1052
665
1053
666
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:162
1054
667
# 245b3f4735b2450db24ddca21be8e504
1055
668
msgid "With that out of the way, let's focus on the actual changelog entry itself: it is very important to document:"
1056
669
msgstr ""
1057
670
1058
671
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:165
1059
672
# 43f30ecd000741b2849656bfa9c6ae55
1060
673
msgid "where the change was done"
1061
674
msgstr ""
1062
675
1063
676
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:166
1064
677
# 6aa10c8f84ff4278888e5edc11cfdf66
1065
678
msgid "what was changed"
1066
679
msgstr ""
1067
680
1068
681
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:167
1069
682
# a48a34986f8248b891f819d4abcff85c
1070
683
msgid "where the discussion of the change happened"
1071
684
msgstr ""
1072
685
1073
686
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:169
1074
687
# b5105651513148e58182645ef1350d2b
1075
688
msgid "In our (very sparse) example the last point is covered by ``(LP: #123456)`` which refers to Launchpad bug 123456. Bug reports or mailing list threads or specifications are usually good information to provide as a rationale for a change. As a bonus, if you use the ``LP: #<number>`` notation for Launchpad bugs, the bug will be automatically closed when the package is uploaded to Ubuntu."
1076
689
msgstr ""
1077
690
1078
691
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:178
1079
692
# 7e3ca41954e44f68bcbe1755d6a53f74
1080
693
msgid "Committing the fix"
1081
694
msgstr ""
1082
695
1083
696
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:180
1084
697
# 8931133984c348d5991fb0d11db638e0
1085
698
msgid "With the changelog entry written and saved, you can just run::"
1086
699
msgstr ""
1087
700
1088
701
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:184
1089
702
# 694988e85f33437b9af1ab2c8a9192af
1090
703
msgid "and the change will be committed (locally) with your changelog entry as a commit message."
1091
704
msgstr ""
1092
705
1093
706
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:187
1094
707
# c7c33ddc56cd406cb79afea806a24ab7
1095
708
msgid "To push it to Launchpad, as the remote branch name, you need to stick to the following nomenclature::"
1096
709
msgstr ""
1097
710
1098
711
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:192
1099
712
# d43eb74f6725404a8e0c12ee36207d3d
1100
713
msgid "This could for example be::"
1101
714
msgstr ""
1102
715
1103
716
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:196
1104
717
# 9c95cd25baca4246bf40816093dc7f7a
1105
718
msgid "So if you just run::"
1106
719
msgstr ""
1107
720
1108
721
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:201
1109
722
# 5aa8ae3e79484b43bf7f43d93010513b
1110
723
msgid "you should be all set. The push command should push it to Launchpad and the second command will open the Launchpad page of the remote branch in your browser. There find the \"(+) Propose for merging\" link, click it to get the change reviewed by somebody and included in Ubuntu."
1111
724
msgstr ""
1112
725
1113
726
#: ../ubuntu-packaging-guide/getting-set-up.rst:3
1114
727
# 83f85e65560046f4b62f45e17b49a17a
1115
728
msgid "Getting Set Up"
1116
729
msgstr ""
1117
730
1118
731
#: ../ubuntu-packaging-guide/getting-set-up.rst:5
1119
732
# a66b7a19ac434a5a909505514b2926ca
1120
733
msgid "There are a number of things you need to do to get started developing for Ubuntu. This article is designed to get your computer set up so that you can start working with packages, and upload your packages to Ubuntu's hosting platform, Launchpad. Here's what we'll cover:"
1121
734
msgstr ""
1122
735
1123
736
#: ../ubuntu-packaging-guide/getting-set-up.rst:10
1124
737
# 086a9c5ecf2d449b82843d303d58a164
1125
738
msgid "Installing packaging-related software. This includes:"
1126
739
msgstr ""
1127
740
1128
741
#: ../ubuntu-packaging-guide/getting-set-up.rst:12
1129
742
# 400b8ae2a4554bb484ea4554b8fdd56d
1130
743
msgid "Ubuntu-specific packaging utilities"
1131
744
msgstr ""
1132
745
1133
746
#: ../ubuntu-packaging-guide/getting-set-up.rst:13
1134
747
# e062bc0cc3ed4294b33616a98d4a5a4d
1135
748
msgid "Encryption software so your work can be verified as being done by you"
1136
749
msgstr ""
1137
750
1138
751
#: ../ubuntu-packaging-guide/getting-set-up.rst:14
1139
752
# 925d91caef104cb7afa6001f05680be9
1140
753
msgid "Additional encryption software so you can securely transfer files"
1141
754
msgstr ""
1142
755
1143
756
#: ../ubuntu-packaging-guide/getting-set-up.rst:16
1144
757
# b0e396c2d5f4463c96d854f06c659d6a
1145
758
msgid "Creating and configuring your account on Launchpad"
1146
759
msgstr ""
1147
760
1148
761
#: ../ubuntu-packaging-guide/getting-set-up.rst:17
1149
762
# 4d333df7195b41f6b125d660b2a1c300
1150
763
msgid "Setting up your development environment to help you do local builds of packages, interact with other developers, and propose your changes on Launchpad."
1151
764
msgstr ""
1152
765
1153
766
#: ../ubuntu-packaging-guide/getting-set-up.rst:22
1154
767
# 9c69c6eea045429a8a34b6fe96139751
1155
768
msgid "It is advisable to do packaging work using the current development version of Ubuntu. Doing so will allow you to test changes in the same environment where those changes will actually be applied and used."
1156
769
msgstr ""
1157
770
1158
771
#: ../ubuntu-packaging-guide/getting-set-up.rst:26
1159
772
# 7c484a283dd34e39a18323d9beac87f9
1160
773
msgid "Don't worry though, the `Ubuntu development release wiki page <https://wiki.ubuntu.com/UsingDevelopmentReleases>`_ shows a variety of ways to safely use the development release."
1161
774
msgstr ""
1162
775
1163
776
#: ../ubuntu-packaging-guide/getting-set-up.rst:32
1164
777
# b98ebc64ff574a5dbf0bdbd1df7a6c8f
1165
778
msgid "Install basic packaging software"
1166
779
msgstr ""
1167
780
1168
781
#: ../ubuntu-packaging-guide/getting-set-up.rst:34
1169
782
# 808a29c5f38f448eb25ca66e04792f0f
1170
783
msgid "There are a number of tools that will make your life as an Ubuntu developer much easier.  You will encounter these tools later in this guide.  To install most of the tools you will need run this command::"
1171
784
msgstr ""
1172
785
1173
786
#: ../ubuntu-packaging-guide/getting-set-up.rst:41
1174
787
# fac16697cacf4355a80e8f5b88f324a0
1175
788
msgid "Note: Since Ubuntu 11.10 \"Oneiric Ocelot\" (or if you have Backports enabled on a currently supported release), the following command will install the above and other tools which are quite common in Ubuntu development::"
1176
789
msgstr ""
1177
790
1178
791
#: ../ubuntu-packaging-guide/getting-set-up.rst:49
1179
792
# 49e40cea430146ec8c2692a2a6bcd425
1180
793
msgid "This command will install the following software:"
1181
794
msgstr ""
1182
795
1183
796
#: ../ubuntu-packaging-guide/getting-set-up.rst:51
1184
797
# 4e959df03bee4ba6a973d4f2cbffec9d
1185
798
msgid "``gnupg`` -- `GNU Privacy Guard`_ contains tools you will need to create a cryptographic key with which you will sign files you want to upload to Launchpad."
1186
799
msgstr ""
1187
800
1188
801
#: ../ubuntu-packaging-guide/getting-set-up.rst:54
1189
802
# 1c457996b9ff49cfb8720509a4314a6d
1190
803
msgid "``pbuilder`` -- a tool to do a reproducible builds of a package in a clean and isolated environment."
1191
804
msgstr ""
1192
805
1193
806
#: ../ubuntu-packaging-guide/getting-set-up.rst:56
1194
807
# e9c0f3fd07be45c2928f88eb383771ed
1195
808
msgid "``ubuntu-dev-tools`` (and ``devscripts``, a direct dependency) -- a collection of tools that make many packaging tasks easier."
1196
809
msgstr ""
1197
810
1198
811
#: ../ubuntu-packaging-guide/getting-set-up.rst:58
1199
812
# 29db292e4464422eb0e4e6222af33ef5
1200
813
msgid "``bzr-builddeb`` (and ``bzr``, a dependency) -- distributed version control with Bazaar, a new way of working with packages for Ubuntu that will make it easy for many developers to collaborate and work on the same code while keeping it trivial to merge each others work."
1201
814
msgstr ""
1202
815
1203
816
#: ../ubuntu-packaging-guide/getting-set-up.rst:62
1204
817
# 9f5925a4d2014953af7c6070b31a157c
1205
818
msgid "``apt-file`` provides an easy way to find the binary package that contains a given file."
1206
819
msgstr ""
1207
820
1208
821
#: ../ubuntu-packaging-guide/getting-set-up.rst:64
1209
822
# 2110c86d771140b7bc69c2958b28464d
1210
823
msgid "``apt-cache`` (part of the ``apt`` package) provides even more information about packages on Ubuntu."
1211
824
msgstr ""
1212
825
1213
826
#: ../ubuntu-packaging-guide/getting-set-up.rst:69
1214
827
# 0a14b46fec014f97bd7557e4d9258941
1215
828
msgid "Create your GPG key"
1216
829
msgstr ""
1217
830
1218
831
#: ../ubuntu-packaging-guide/getting-set-up.rst:71
1219
832
# 16d8e0261d5a48dfb0ff6aeede808b34
1220
833
msgid "GPG stands for `GNU Privacy Guard`_ and it implements the OpenPGP standard which allows you to sign and encrypt messages and files. This is useful for a number of purposes. In our case it is important that you can sign files with your key so they can be identified as something that you worked on. If you upload a source package to Launchpad, it will only accept the package if it can absolutely determine who uploaded the package."
1221
834
msgstr ""
1222
835
1223
836
#: ../ubuntu-packaging-guide/getting-set-up.rst:78
1224
837
# c25b4a7c3abd47c4adab9c0d4a8f88e4
1225
838
msgid "To generate a new GPG key, run::"
1226
839
msgstr ""
1227
840
1228
841
#: ../ubuntu-packaging-guide/getting-set-up.rst:82
1229
842
# 854929b1b9b74e56a91d8cdac1b6ccbf
1230
843
msgid "GPG will first ask you which kind of key you want to generate. Choosing the default (RSA and DSA) is fine. Next it will ask you about the keysize. The default (currently 2048) is fine, but 4096 is more secure. Afterward, it will ask you if you want it to expire the key at some stage. It is safe to say \"0\", which means the key will never expire. The last questions will be about your name and email address. Just pick the ones you are going to use for Ubuntu development here, you can add additional email addresses later on. Adding a comment is not necessary. Then you will have to set a passphrase, choose a safe one (a passphrase is just a password which is allowed to include spaces)."
1231
844
msgstr ""
1232
845
1233
846
#: ../ubuntu-packaging-guide/getting-set-up.rst:92
1234
847
# c9411759e55c44f7b4ff04ab876850e9
1235
848
msgid "Now GPG will create a key for you, which can take a little bit of time; it needs random bytes, so if you give the system some work to do it will be just fine.  Move the cursor around, type some paragraphs of random text, load some web page."
1236
849
msgstr ""
1237
850
1238
851
#: ../ubuntu-packaging-guide/getting-set-up.rst:97
1239
852
# 671e66dd26de4cc19167919c4cacf056
1240
853
msgid "Once this is done, you will get a message similar to this one::"
1241
854
msgstr ""
1242
855
1243
856
#: ../ubuntu-packaging-guide/getting-set-up.rst:104
1244
857
# fbcfbe47756f426092c3860dad3c1fec
1245
858
msgid "In this case ``43CDE61D`` is the *key ID*."
1246
859
msgstr ""
1247
860
1248
861
#: ../ubuntu-packaging-guide/getting-set-up.rst:106
1249
862
# 5bcf72402a81478a8210db244d7a62f9
1250
863
msgid "Next, you need to upload the public part of your key to a keyserver so the world can identify messages and files as yours. To do so, enter::"
1251
864
msgstr ""
1252
865
1253
866
#: ../ubuntu-packaging-guide/getting-set-up.rst:111
1254
867
# 457a5844d06c44969821537e48cdf762
1255
868
msgid "This will send your key to one keyserver, but a network of keyservers will automatically sync the key between themselves. Once this syncing is complete, your signed public key will be ready to verify your contributions around the world."
1256
869
msgstr ""
1257
870
1258
871
#: ../ubuntu-packaging-guide/getting-set-up.rst:118
1259
872
# bbd6cfc0f36241b9afc8304a4955b10f
1260
873
msgid "Create your SSH key"
1261
874
msgstr ""
1262
875
1263
876
#: ../ubuntu-packaging-guide/getting-set-up.rst:120
1264
877
# cbe44e54369c43ccbaf972bb10995704
1265
878
msgid "SSH_ stands for *Secure Shell*, and it is a protocol that allows you to exchange data in a secure way over a network. It is common to use SSH to access and open a shell on another computer, and to use it to securely transfer files. For our purposes, we will mainly be using SSH to securely upload source packages to Launchpad."
1266
879
msgstr ""
1267
880
1268
881
#: ../ubuntu-packaging-guide/getting-set-up.rst:126
1269
882
# 15220156465043d89c0f0a526b3ae31d
1270
883
msgid "To generate an SSH key, enter::"
1271
884
msgstr ""
1272
885
1273
886
#: ../ubuntu-packaging-guide/getting-set-up.rst:130
1274
887
# 4369607909e54d2eb28b701b18832582
1275
888
msgid "The default file name usually makes sense, so you can just leave it as it is. For security purposes, it is highly recommended that you use a passphrase."
1276
889
msgstr ""
1277
890
1278
891
#: ../ubuntu-packaging-guide/getting-set-up.rst:135
1279
892
# 4709c05c499e4a29bd71f5f1aef90b23
1280
893
msgid "Set up pbuilder"
1281
894
msgstr ""
1282
895
1283
896
#: ../ubuntu-packaging-guide/getting-set-up.rst:137
1284
897
# 74362386ed8340f2b5c45b2bdb9a08da
1285
898
msgid "``pbuilder`` allows you to build packages locally on your machine. It serves a couple of purposes:"
1286
899
msgstr ""
1287
900
1288
901
#: ../ubuntu-packaging-guide/getting-set-up.rst:140
1289
902
# 93aa3aaf40b44beb8662c330374e4e50
1290
903
msgid "The build will be done in a minimal and clean environment. This helps you make sure your builds succeed in a reproducible way, but without modifying your local system"
1291
904
msgstr ""
1292
905
1293
906
#: ../ubuntu-packaging-guide/getting-set-up.rst:143
1294
907
# 5169282689aa4be29c874e27633030f0
1295
908
msgid "There is no need to install all necessary *build dependencies* locally"
1296
909
msgstr ""
1297
910
1298
911
#: ../ubuntu-packaging-guide/getting-set-up.rst:144
1299
912
# c97e8554b32d4e71965f1ff6479f13b6
1300
913
msgid "You can set up multiple instances for various Ubuntu and Debian releases"
1301
914
msgstr ""
1302
915
1303
916
#: ../ubuntu-packaging-guide/getting-set-up.rst:146
1304
917
# 6a4d016f67b64cf3bbe9148306cbb3b8
1305
918
msgid "Setting ``pbuilder`` up is very easy, run::"
1306
919
msgstr ""
1307
920
1308
921
#: ../ubuntu-packaging-guide/getting-set-up.rst:150
1309
922
# fa64536c0c324d27983772c20599b26c
1310
923
msgid "where <release> is for example `natty`, `maverick`, `lucid` or in the case of Debian maybe `sid`. This will take a while as it will download all the necessary packages for a \"minimal installation\". These will be cached though."
1311
924
msgstr ""
1312
925
1313
926
#: ../ubuntu-packaging-guide/getting-set-up.rst:156
1314
927
# 5dc23eff94724361a73a59dea44289e7
1315
928
msgid "Get set up to work with Launchpad"
1316
929
msgstr ""
1317
930
1318
931
#: ../ubuntu-packaging-guide/getting-set-up.rst:158
1319
932
# 95fadc8adf9f4a0e91bac3115a3d0cf1
1320
933
msgid "With a basic local configuration in place, your next step will be to configure your system to work with Launchpad. This section will focus on the following topics:"
1321
934
msgstr ""
1322
935
1323
936
#: ../ubuntu-packaging-guide/getting-set-up.rst:162
1324
937
# b79f07693785483782ed6821e0a0b9ef
1325
938
msgid "What Launchpad is and creating a Launchpad account"
1326
939
msgstr ""
1327
940
1328
941
#: ../ubuntu-packaging-guide/getting-set-up.rst:163
1329
942
# e32ac038b50b4d829f13044673ba85bc
1330
943
msgid "Uploading your GPG and SSH keys to Launchpad"
1331
944
msgstr ""
1332
945
1333
946
#: ../ubuntu-packaging-guide/getting-set-up.rst:164
1334
947
# 50d201d98b2747bf9b900ebd2033d4b6
1335
948
msgid "Configuring Bazaar to work with Launchpad"
1336
949
msgstr ""
1337
950
1338
951
#: ../ubuntu-packaging-guide/getting-set-up.rst:165
1339
952
# 2fcbff75feec47c890b29ae9a0accc58
1340
953
msgid "Configuring Bash to work with Bazaar"
1341
954
msgstr ""
1342
955
1343
956
#: ../ubuntu-packaging-guide/getting-set-up.rst:169
1344
957
# 7d3092a6e1a142afa5c22a094e2be344
1345
958
msgid "About Launchpad"
1346
959
msgstr ""
1347
960
1348
961
#: ../ubuntu-packaging-guide/getting-set-up.rst:171
1349
962
# c032fdb17ad44f8a9972c7b1160387dd
1350
963
msgid "Launchpad is the central piece of infrastructure we use in Ubuntu. It not only stores our packages and our code, but also things like translations, bug reports, and information about the people who work on Ubuntu and their team memberships.  You will also use Launchpad to publish your proposed fixes, and get other Ubuntu developers to review and sponsor them."
1351
964
msgstr ""
1352
965
1353
966
#: ../ubuntu-packaging-guide/getting-set-up.rst:177
1354
967
# ad9d175d99654dad8e2c830c4beecab0
1355
968
msgid "You will need to register with Launchpad and provide a minimal amount of information. This will allow you to download and upload code, submit bug reports, and more."
1356
969
msgstr ""
1357
970
1358
971
#: ../ubuntu-packaging-guide/getting-set-up.rst:181
1359
972
# 0c25cf1d67e14ebc9621decebd78ef5c
1360
973
msgid "Besides hosting Ubuntu, Launchpad can host any Free Software project. For more information see the `Launchpad Help wiki <https://help.launchpad.net/>`_."
1361
974
msgstr ""
1362
975
1363
976
#: ../ubuntu-packaging-guide/getting-set-up.rst:186
1364
977
# 1060bd4edaa345a9a90d8c2e34628202
1365
978
msgid "Get a Launchpad account"
1366
979
msgstr ""
1367
980
1368
981
#: ../ubuntu-packaging-guide/getting-set-up.rst:188
1369
982
# 308e70601909430d842502f21e1589ad
1370
983
msgid "If you don't already have a Launchpad account, you can easily `create one`_. If you have a Launchpad account but cannot remember your Launchpad id, you can find this out by going to https://launchpad.net/~ and looking for the part after the `~` in the URL."
1371
984
msgstr ""
1372
985
1373
986
#: ../ubuntu-packaging-guide/getting-set-up.rst:193
1374
987
# a0e1270b66884075a0074a83105aded1
1375
988
msgid "Launchpad's registration process will ask you to choose a display name. It is encouraged for you to use your real name here so that your Ubuntu developer colleagues will be able to get to know you better."
1376
989
msgstr ""
1377
990
1378
991
#: ../ubuntu-packaging-guide/getting-set-up.rst:197
1379
992
# 7f4a08d3ce224e59b0d23ba2f4bc4b15
1380
993
msgid "When you register a new account, Launchpad will send you an email with a link you need to open in your browser in order to verify your email address. If you don't receive it, check in your spam folder."
1381
994
msgstr ""
1382
995
1383
996
#: ../ubuntu-packaging-guide/getting-set-up.rst:201
1384
997
# ff7522539ab64385b5e3460fec3e6c7f
1385
998
msgid "`The new account help page <https://help.launchpad.net/YourAccount/NewAccount>`_ on Launchpad has more information about the process and additional settings you can change."
1386
999
msgstr ""
1387
1000
1388
1001
#: ../ubuntu-packaging-guide/getting-set-up.rst:207
1389
1002
# 8a4be4c66e1e4e4bbd19c1d319bb28bc
1390
1003
msgid "Upload your GPG key to Launchpad"
1391
1004
msgstr ""
1392
1005
1393
1006
#: ../ubuntu-packaging-guide/getting-set-up.rst:209
1394
1007
# 506b5b99e7ac4c87ae989c190b86e41a
1395
1008
msgid "To find about your GPG fingerprint, run::"
1396
1009
msgstr ""
1397
1010
1398
1011
#: ../ubuntu-packaging-guide/getting-set-up.rst:213
1399
1012
# 472d7ced0c4c4d6da22703585fa46fe7
1400
1013
msgid "and it will print out something like::"
1401
1014
msgstr ""
1402
1015
1403
1016
#: ../ubuntu-packaging-guide/getting-set-up.rst:221
1404
1017
# 0c821916735d4f45a78d52e91ef3239e
1405
1018
msgid "Head to https://launchpad.net/~/+editpgpkeys and copy the \"Key fingerprint\" into the text box. In the case above this would be ``5C28 0144 FB08 91C0 2CF3  37AC 6F0B F90F 43CD E61D``. Now click on \"Import Key\"."
1406
1019
msgstr ""
1407
1020
1408
1021
#: ../ubuntu-packaging-guide/getting-set-up.rst:226
1409
1022
# ec669b136a8c42269d9abfeb85d34c09
1410
1023
msgid "Launchpad will use the fingerprint to check the Ubuntu key server for your key and, if successful, send you an encrypted email asking you to confirm the key import. Check your email account and read the email that Launchpad sent you. `If your email client supports OpenPGP encryption, it will prompt you for the password you chose for the key when GPG generated it. Enter the password, then click the link to confirm that the key is yours.`"
1411
1024
msgstr ""
1412
1025
1413
1026
#: ../ubuntu-packaging-guide/getting-set-up.rst:233
1414
1027
# f08b21d4e43b485194ec184975a04f7f
1415
1028
msgid "Launchpad encrypts the email, using your public key, so that it can be sure that the key is yours. If your email software does not support OpenPGP encryption, copy the encrypted email's contents, type ``gpg`` in your terminal, then paste the email contents into your terminal window."
1416
1029
msgstr ""
1417
1030
1418
1031
#: ../ubuntu-packaging-guide/getting-set-up.rst:238
1419
1032
# b7455eb7f4da4959b24ef5339b994d19
1420
1033
msgid "Back on the Launchpad website, use the Confirm button and Launchpad will complete the import of your OpenPGP key."
1421
1034
msgstr ""
1422
1035
1423
1036
#: ../ubuntu-packaging-guide/getting-set-up.rst:241
1424
1037
# 8b0f15062c314bd5bc0578ab0db7233b
1425
1038
msgid "Find more information at https://help.launchpad.net/YourAccount/ImportingYourPGPKey"
1426
1039
msgstr ""
1427
1040
1428
1041
#: ../ubuntu-packaging-guide/getting-set-up.rst:245
1429
1042
# c7408c90022943d2b2adb9e67b8c079d
1430
1043
msgid "Upload your SSH key to Launchpad"
1431
1044
msgstr ""
1432
1045
1433
1046
#: ../ubuntu-packaging-guide/getting-set-up.rst:247
1434
1047
# d55a8885d648402ebc1c8bfa9de5b62a
1435
1048
msgid "Open https://launchpad.net/~/+editsshkeys in a web browser, also open ``~/.ssh/id_rsa.pub`` in a text editor. This is the public part of your SSH key, so it is safe to share it with Launchpad. Copy the contents of the file and paste them into the text box on the web page that says \"Add an SSH key\". Now click \"Import Public Key\"."
1436
1049
msgstr ""
1437
1050
1438
1051
#: ../ubuntu-packaging-guide/getting-set-up.rst:253
1439
1052
# d94df3105f334f17a6b8b4493abb7237
1440
1053
msgid "For more information on this process, visit the `<creating an SSH keypair <https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair>`_ page on Launchpad."
1441
1054
msgstr ""
1442
1055
1443
1056
#: ../ubuntu-packaging-guide/getting-set-up.rst:259
1444
1057
# 8452a24ce68f4df6ac5e44518ef879ad
1445
1058
msgid "Configure Bazaar"
1446
1059
msgstr ""
1447
1060
1448
1061
#: ../ubuntu-packaging-guide/getting-set-up.rst:261
1449
1062
# 2200087023b540598f73cba55e6d1e43
1450
1063
msgid "Bazaar is the tool we use to store code changes in a logical way, to exchange proposed changes and merge them, even if development is done concurrently.  It is used for the new Ubuntu Distributed Development method of working with Ubuntu packages."
1451
1064
msgstr ""
1452
1065
1453
1066
#: ../ubuntu-packaging-guide/getting-set-up.rst:266
1454
1067
# 6809b71125db4a1c9a7039c20642d0c5
1455
1068
msgid "To tell Bazaar who you are, simply run::"
1456
1069
msgstr ""
1457
1070
1458
1071
#: ../ubuntu-packaging-guide/getting-set-up.rst:271
1459
1072
# a7bbc2cbc2104be08887d3f357de5253
1460
1073
msgid "`whoami` will tell Bazaar which name and email address it should use for your commit messages. With `launchpad-login` you set your Launchpad ID. This way code that you publish in Launchpad will be associated with you."
1461
1074
msgstr ""
1462
1075
1463
1076
#: ../ubuntu-packaging-guide/getting-set-up.rst:275
1464
1077
# b91245d32a2440a583e602e2b0c85ac3
1465
1078
msgid "Note: If you can not remember the ID, go to https://launchpad.net/~ and see where it redirects you. The part after the \"~\" in the URL is your Launchpad ID.)"
1466
1079
msgstr ""
1467
1080
1468
1081
#: ../ubuntu-packaging-guide/getting-set-up.rst:281
1469
1082
# e267401effd84ebe9fad680ad51c3cd9
1470
1083
msgid "Configure your shell"
1471
1084
msgstr ""
1472
1085
1473
1086
#: ../ubuntu-packaging-guide/getting-set-up.rst:282
1474
1087
# c497e7fe9aed473fac7283134a606445
1475
1088
msgid "Similar to Bazaar, the Debian/Ubuntu packaging tools need to learn about you as well. Simply open your `~/.bashrc` in a text editor and add something like this to the bottom of it::"
1476
1089
msgstr ""
1477
1090
1478
1091
#: ../ubuntu-packaging-guide/getting-set-up.rst:289
1479
1092
# f1400dd33613411caa2495b24cb8901b
1480
1093
msgid "Now save the file and either restart your terminal or run::"
1481
1094
msgstr ""
1482
1095
1483
1096
#: ../ubuntu-packaging-guide/getting-set-up.rst:293
1484
1097
# 71fcef52c0ce4c6a9f9e098c4f35cd1a
1485
1098
msgid "(If you do not use the default shell, which is `bash`, please edit the configuration file for that shell accordingly.)"
1486
1099
msgstr ""
1487
1100
1488
1101
#: ../ubuntu-packaging-guide/index.rst:7
1489
1102
# 2b2c79c0f4744aa6ac31ab4d14510523
1490
1103
msgid "Ubuntu Packaging Guide"
1491
1104
msgstr ""
1492
1105
1493
1106
#: ../ubuntu-packaging-guide/index.rst:9
1494
1107
# 2804b34604314864a75fcd88568b92f0
1495
1108
msgid "Ubuntu is not only a free and open source operating system, its platform is also open and developed in a transparent fashion. The source code for every single component can be obtained easily and every single change to the Ubuntu platform can be reviewed."
1496
1109
msgstr ""
1497
1110
1498
1111
#: ../ubuntu-packaging-guide/index.rst:14
1499
1112
# e4717243c36b4fbaa8a4ab4731b7c6a2
1500
1113
msgid "This means you can actively get involved in improving it and the community of Ubuntu platform developers is always interested in helping peers getting started."
1501
1114
msgstr ""
1502
1115
1503
1116
#: ../ubuntu-packaging-guide/index.rst:18
1504
1117
# a8931d21f1314e2abf31996f75be3676
1505
1118
msgid "The guide is split up into two sections:"
1506
1119
msgstr ""
1507
1120
1508
1121
#: ../ubuntu-packaging-guide/index.rst:20
1509
1122
# 4432017dc60141218901d1062a4db48d
1510
1123
msgid "A list of articles based on tasks, things you want to get done."
1511
1124
msgstr ""
1512
1125
1513
1126
#: ../ubuntu-packaging-guide/index.rst:21
1514
1127
# 0d65327272d34bd094988cd9f7ec6044
1515
1128
msgid "A set of knowledge-base articles that dig deeper into specific bits of our tools and workflows."
1516
1129
msgstr ""
1517
1130
1518
1131
#: ../ubuntu-packaging-guide/index.rst:24
1519
1132
# e9691f9962684fa2983959309c708dc6
1520
1133
msgid "This guide focuses on the Ubuntu Distributed Development packaging method. This is a new way of packaging which uses Distributed Revision Control branches.  It currently has some limitations which mean many teams in Ubuntu use :doc:`traditional packaging<./traditional-packaging>` methods.  See the :doc:`UDD Introduction<./udd-intro>` page for an introduction to the differences."
1521
1134
msgstr ""
1522
1135
1523
1136
#: ../ubuntu-packaging-guide/index.rst:31
1524
1137
# 35611cc67071493d95b0fd914f093f18
1525
1138
msgid "Articles"
1526
1139
msgstr ""
1527
1140
1528
1141
#: ../ubuntu-packaging-guide/index.rst:46
1529
1142
# 341532acc9554b0d9d4a83f5a043fdf9
1530
1143
msgid "Knowledge Base"
1531
1144
msgstr ""
1532
1145
1533
1146
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:3
1534
1147
# 795cb22fada7442f821a6d3640677ae7
1535
1148
msgid "Introduction to Ubuntu Development"
1536
1149
msgstr ""
1537
1150
1538
1151
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:5
1539
1152
# d1e2a2fc83084defb2029936d7af82db
1540
1153
msgid "Ubuntu is made up of thousands of different components, written in many different programming languages. Every component -  be it a software library, a tool or a graphical application - is available as a source package. Source packages in most cases consist of two parts: the actual source code and metadata. Metadata includes the dependencies of the package, copyright and licensing information, and instructions on how to build the package. Once this source package is compiled, the build process provides binary packages, which are the .deb files users can install."
1541
1154
msgstr ""
1542
1155
1543
1156
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:14
1544
1157
# d092727879c148148df7ae3a396ba4c1
1545
1158
msgid "Every time a new version of an application is released, or when someone makes a change to the source code that goes into Ubuntu, the source package must be uploaded to Launchpad's build machines to be compiled. The resulting binary packages then are distributed to the archive and its mirrors in different countries. The URLs in ``/etc/apt/sources.list`` point to an archive or mirror. Every day CD images are built for a selection of different Ubuntu flavours. Ubuntu Desktop, Ubuntu Server, Kubuntu and others specify a list of required packages that get on the CD. These CD images are then used for installation tests and provide the feedback for further release planning."
1546
1159
msgstr ""
1547
1160
1548
1161
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:24
1549
1162
# 6e37b4d95d8541b7aa3011844140dfd8
1550
1163
msgid "Ubuntu's development is very much dependent on the current stage of the release cycle. We release a new version of Ubuntu every six months, which is only possible because we have established strict freeze dates. With every freeze date that is reached developers are expected to make fewer, less intrusive changes. Feature Freeze is the first big freeze date after the first half of the cycle has passed. At this stage features must be largely implemented. The rest of the cycle is supposed to be focused on fixing bugs. After that the user interface, then the documentation, the kernel, etc. are frozen, then the beta release is put out which receives a lot of testing. From the beta release onwards, only critical bugs get fixed and a release candidate release is made and if it does not contain any serious problems, it becomes the final release."
1551
1164
msgstr ""
1552
1165
1553
1166
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:39
1554
1167
# 3095f0dc21b845bd9adafbc230310de6
1555
1168
msgid "Thousands of source packages, billions of lines of code, hundreds of contributors require a lot of communication and planning to maintain high standards of quality. At the beginning of each release cycle we have the Ubuntu Developer Summit where developers and contributors come together to plan the features of the next releases. Every feature is discussed by its stakeholders and a specification is written that contains detailed information about its assumptions, implementation, the necessary changes in other places, how to test it and so on. This is all done in an open and transparent fashion, so even if you can not attend the event in person, you can participate remotely and listen to a streamcast, chat with attendants and subscribe to changes of specifications, so you are always up to date."
1556
1169
msgstr ""
1557
1170
1558
1171
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:51
1559
1172
# c2c9a07df8734bcd84811b0d08005493
1560
1173
msgid "Not every single change can be discussed in a meeting though, particularly because Ubuntu relies on changes that are done in other projects. That is why contributors to Ubuntu constantly stay in touch. Most teams or projects use dedicated mailing lists to avoid too much unrelated noise. For more immediate coordination, developers and contributors use Internet Relay Chat (IRC). All discussions are open and public."
1561
1174
msgstr ""
1562
1175
1563
1176
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:58
1564
1177
# 89290a1fefbc4e5a87353e069aeb79ac
1565
1178
msgid "Another important tool regarding communication is bug reports. Whenever a defect is found in a package or piece of infrastructure, a bug report is filed in Launchpad. All information is collected in that report and its importance, status and assignee updated when necessary. This makes it an effective tool to stay on top of bugs in a package or project and organise the workload."
1566
1179
msgstr ""
1567
1180
1568
1181
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:65
1569
1182
# 224c0402acf54540b6e21eb5498d8bf9
1570
1183
msgid "Most of the software available through Ubuntu is not written by Ubuntu developers themselves. Most of it is written by developers of other Open Source projects and then integrated into Ubuntu. These projects are called \"Upstreams\", because their source code flows into Ubuntu, where we \"just\" integrate it. The relationship to Upstreams is critically important to Ubuntu. It is not just code that Ubuntu gets from Upstreams, but it is also that Upstreams get users, bug reports and patches from Ubuntu (and other distributions)."
1571
1184
msgstr ""
1572
1185
1573
1186
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:74
1574
1187
# 7b06da07d99842fd9738c38140dd2a16
1575
1188
msgid "The most important Upstream for Ubuntu is Debian. Debian is the distribution that Ubuntu is based on and many of the design decisions regarding the packaging infrastructure are made there. Traditionally, Debian has always had dedicated maintainers for every single package or dedicated maintenance teams. In Ubuntu there are teams that have an interest in a subset of packages too, and naturally every developer has a special area of expertise, but participation (and upload rights) generally is open to everyone who demonstrates ability and willingness."
1576
1189
msgstr ""
1577
1190
1578
1191
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:83
1579
1192
# c04e0435ba0d4bb38160660e3cda4ca0
1580
1193
msgid "Getting a change into Ubuntu as a new contributor is not as daunting as it seems and can be a very rewarding experience. It is not only about learning something new and exciting, but also about sharing the solution and solving a problem for millions of users out there."
1581
1194
msgstr ""
1582
1195
1583
1196
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:88
1584
1197
# 72ea8fca34b04f5eb28aae4b06eaa638
1585
1198
msgid "Open Source Development happens in a distributed world with different goals and different areas of focus. For example there might be the case that a particular Upstream might be interested in working on a new big feature while Ubuntu, because of the tight release schedule, might be interested in shipping a solid version with just an additional bug fix. That is why we make use of \"Distributed Development\", where code is being worked on in various branches that are merged with each other after code reviews and sufficient discussion."
1586
1199
msgstr ""
1587
1200
1588
1201
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:98
1589
1202
# 38a1680f15f04e2785f959f32e8b7311
1590
1203
msgid "In the example mentioned above it would make sense to ship Ubuntu with the existing version of the project, add the bugfix, get it into Upstream for their next release and ship that (if suitable) in the next Ubuntu release. It would be the best possible compromise and a situation where everybody wins."
1591
1204
msgstr ""
1592
1205
1593
1206
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:103
1594
1207
# b1e0446cdaa9426cb9aa082ca826788c
1595
1208
msgid "To fix a bug in Ubuntu, you would first get the source code for the package, then work on the fix, document it so it is easy to understand for other developers and users, then build the package to test it. After you have tested it, you can easily propose the change to be included in the current Ubuntu development release. A developer with upload rights will review it for you and then get it integrated into Ubuntu."
1596
1209
msgstr ""
1597
1210
1598
1211
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:112
1599
1212
# fa9b32a2c49847f7b576db0fbf94036c
1600
1213
msgid "When trying to find a solution it is usually a good idea to check with Upstream and see if the problem (or a possible solution) is known already and, if not, do your best to make the solution a concerted effort."
1601
1214
msgstr ""
1602
1215
1603
1216
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:116
1604
1217
# 471fe59800924fc88bb010d19ea956f0
1605
1218
msgid "Additional steps might involve getting the change backported to an older, still supported version of Ubuntu and forwarding it to Upstream."
1606
1219
msgstr ""
1607
1220
1608
1221
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:119
1609
1222
# f36cfc93f9314451b2f5756d1652f425
1610
1223
msgid "The most important requirements for success in Ubuntu development are: having a knack for \"making things work again,\" not being afraid to read documentation and ask questions, being a team player and enjoying some detective work."
1611
1224
msgstr ""
1612
1225
1613
1226
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:123
1614
1227
# 7d209126020141168c019c68053e2abd
1615
1228
msgid "Good places to ask your questions are ``ubuntu-motu@lists.ubuntu.com`` and ``#ubuntu-motu`` on ``irc.freenode.net``. You will easily find a lot of new friends and people with the same passion that you have: making the world a better place by making better Open Source software."
1616
1229
msgstr ""
1617
1230
1618
1231
#: ../ubuntu-packaging-guide/kde.rst:3
1619
1232
# 993a9c1aa71f4aadadde6a86b5ef2ed3
1620
1233
msgid "KDE Packaging"
1621
1234
msgstr ""
1622
1235
1623
1236
#: ../ubuntu-packaging-guide/kde.rst:5
1624
1237
# f8f58e55f37f4abcaa7264f5fdc83903
1625
1238
msgid "Packaging of KDE programmes in Ubuntu is managed by the Kubuntu and MOTU teams.  You can contact the Kubuntu team on the `Kubuntu mailing list`_ and ``#kubuntu-devel`` Freenode IRC channl.  More information about Kubuntu development is on the `Kubuntu wiki page`_."
1626
1239
msgstr ""
1627
1240
1628
1241
#: ../ubuntu-packaging-guide/kde.rst:10
1629
1242
# dc2e9c6e5402441f85737795e60858fc
1630
1243
msgid "Our packaging follows the practices of the ``Debian Qt/KDE Team`` and Debian KDE Extras Team.  Most of our packages are derived from the packaging of these Debian teams."
1631
1244
msgstr ""
1632
1245
1633
1246
#: ../ubuntu-packaging-guide/kde.rst:15
1634
1247
# a38db20adbbe4a7da13b3d8559127a47
1635
1248
msgid "Patching Policy"
1636
1249
msgstr ""
1637
1250
1638
1251
#: ../ubuntu-packaging-guide/kde.rst:17
1639
1252
# ac62cb4c0e664dd4b78c074e72f87171
1640
1253
msgid "Kubuntu does not add patches to KDE programmes unless they come from the upstream authors or submitted upstream with the expectation they will be merged soon or we have consulted the issue with the upstream authors."
1641
1254
msgstr ""
1642
1255
1643
1256
#: ../ubuntu-packaging-guide/kde.rst:22
1644
1257
# cb2134c6ba4346458b922470c90a372f
1645
1258
msgid "Kubuntu does not change the branding of packages except where upstream expects this (such as the top left logo of the Kickoff menu) or to simplify (such as removing splash screens)."
1646
1259
msgstr ""
1647
1260
1648
1261
#: ../ubuntu-packaging-guide/kde.rst:27
1649
1262
# d51900d276b44514b5d0c25d00914f01
1650
1263
msgid "debian/rules"
1651
1264
msgstr ""
1652
1265
1653
1266
#: ../ubuntu-packaging-guide/kde.rst:29
1654
1267
# 1311b27e75554f01874d2417d4a5b9bf
1655
1268
msgid "Debian packages include some additions to the basic Debhelper usage. These are kept in the ``pkg-kde-tools`` package."
1656
1269
msgstr ""
1657
1270
1658
1271
#: ../ubuntu-packaging-guide/kde.rst:32
1659
1272
# 4bb8cca6f7f940dc84f4ea1798287277
1660
1273
msgid "Packages which use Debhelper 7 should add the ``--with=kde`` option. This will ensure the correct build flags are used and add options such as handling kdeinit stubs and translations::"
1661
1274
msgstr ""
1662
1275
1663
1276
#: ../ubuntu-packaging-guide/kde.rst:39
1664
1277
# 4a5e3298265c4fd4a8df97acde2c69f0
1665
1278
msgid "Some newer KDE packages use the ``dhmk`` system, an alternative to ``dh`` made by the Debian Qt/KDE team.  You can read about it in /usr/share/pkg-kde-tools/qt-kde-team/2/README.  Packages using this will ``include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk`` instead of running ``dh``."
1666
1279
msgstr ""
1667
1280
1668
1281
#: ../ubuntu-packaging-guide/kde.rst:47
1669
1282
# 15bc35a1eefa4bee8ed9330f9a044380
1670
1283
msgid "Translations"
1671
1284
msgstr ""
1672
1285
1673
1286
#: ../ubuntu-packaging-guide/kde.rst:49
1674
1287
# ffae416394ec437c93e62703e46d4c93
1675
1288
msgid "Packages in main have their translations imported into Launchpad and exported from Launchpad into Ubuntu's language-packs."
1676
1289
msgstr ""
1677
1290
1678
1291
#: ../ubuntu-packaging-guide/kde.rst:52
1679
1292
# e2265cab7d764b4b83529d3b24129102
1680
1293
msgid "So any KDE package in main must generate translation templates, include or make available upstream translations and handle ``.desktop`` file translations."
1681
1294
msgstr ""
1682
1295
1683
1296
#: ../ubuntu-packaging-guide/kde.rst:56
1684
1297
# 98fc332176d84794aafa13b935d98523
1685
1298
msgid "To generate translation templates the package must include a ``Messages.sh`` file; complain to the upstream if it does not.  You can check it works by running ``extract-messages.sh`` which should produce one or more ``.pot`` files in ``po/``.  This will be done automatically during build if you use the ``--with=kde`` option to ``dh``."
1686
1299
msgstr ""
1687
1300
1688
1301
#: ../ubuntu-packaging-guide/kde.rst:63
1689
1302
# 931ea74ab2164fe8a5a982500456cbb2
1690
1303
msgid "Upstream will usually have also put the translation ``.po`` files into the ``po/`` directory.  If they do not, check if they are in separate upstream language packs such as the KDE SC language packs.  If they are in separate language packs Launchpad will need to associate these together manually, contact `dpm`_ to do this."
1691
1304
msgstr ""
1692
1305
1693
1306
#: ../ubuntu-packaging-guide/kde.rst:69
1694
1307
# 52573e8867ac4ed2840f572b9facbcb9
1695
1308
msgid "If a package is moved from universe to main it will need to be reuploaded before the translations get imported into Launchpad."
1696
1309
msgstr ""
1697
1310
1698
1311
#: ../ubuntu-packaging-guide/kde.rst:72
1699
1312
# 198ae177145b49b285220a56326dd9ce
1700
1313
msgid "``.desktop`` files also need translations.  We patch KDELibs to read translations out of ``.po`` files which are pointed to by a line ``X-Ubuntu-Gettext-Domain=`` added to ``.desktop`` files at package build time.  A .pot file for each package is be generated at build time and .po files need to be downloaded from upstream and included in the package or in our language packs.  The list of .po files to be downloaded from KDE's repositories is in ``/usr/lib/kubuntu-desktop-i18n/desktop-template-list``."
1701
1314
msgstr ""
1702
1315
1703
1316
#: ../ubuntu-packaging-guide/kde.rst:82
1704
1317
# b49c7bc8627b48a7b4931ebd99bb725d
1705
1318
msgid "Library Symbols"
1706
1319
msgstr ""
1707
1320
1708
1321
#: ../ubuntu-packaging-guide/kde.rst:84
1709
1322
# a20fa5bcd911465789f7e4c2dfd61207
1710
1323
msgid "Library symbols are tracked in ``.symbols`` files to ensure none go missing for new releases.  KDE uses C++ libraries which act a little differently compared to C libraries.  Debian's Qt/KDE Team have scripts to handle this. See `Working with symbols files`_ for how to create and keep these files up to date."
1711
1324
msgstr ""
1712
1325
1713
1326
#: ../ubuntu-packaging-guide/libraries.rst:3
1714
1327
# 1161adad2b574c3dae7242a0e177d3cb
1715
1328
msgid "Shared Libraries"
1716
1329
msgstr ""
1717
1330
1718
1331
#: ../ubuntu-packaging-guide/libraries.rst:5
1719
1332
# e5417138b06748e7b459aee1467052f7
1720
1333
msgid "Shared libraries are compiled code which is intended to be shared among several different programmes.  They are distributed as ``.so`` files in ``/usr/lib/``."
1721
1334
msgstr ""
1722
1335
1723
1336
#: ../ubuntu-packaging-guide/libraries.rst:9
1724
1337
# 3ea2eb4efb504f41812aad3d3a3630c0
1725
1338
msgid "A library exports symbols which are the compiled versions of functions, classes and variables.  A library has a name called an SONAME which includes a version number.  This SONAME version does not necessarily match the public release version number.  A programme gets compiled against a given SONAME version of the library.  If any of the symbols is removed or changes then the version number needs to be changed which forces any packages using that library to be recompiled against the new version.  Version numbers are usually set by upstream and we follow them in our binary package names called an ABI number, but sometimes upstreams do not use sensible version numbers and packagers have to keep separate version numbers."
1726
1339
msgstr ""
1727
1340
1728
1341
#: ../ubuntu-packaging-guide/libraries.rst:21
1729
1342
# 07915fe981c94c4db90837dba30d3cc0
1730
1343
msgid "Libraries are usually distributed by upstream as standalone releases. Sometimes they are distributed as part of a programme.  In this case they can be included in the binary package along with the programme (this is called bundling) if you do not expect any other programmes to use the library, more often they should be split out into separate binary packages."
1731
1344
msgstr ""
1732
1345
1733
1346
#: ../ubuntu-packaging-guide/libraries.rst:27
1734
1347
# 4c5c66ef19a44914bee41dc0539099fa
1735
1348
msgid "The libraries themselves are put into a binary package named ``libfoo1`` where ``foo`` is the name of the library and ``1`` is the version from the SONAME. Development files from the package, such as header files, needed to compile programmes against the library are put into a package called ``libfoo-dev``."
1736
1349
msgstr ""
1737
1350
1738
1351
#: ../ubuntu-packaging-guide/libraries.rst:34
1739
1352
# 06a1e94fcbba4e9eadba9eb114a9c642
1740
1353
msgid "An Example"
1741
1354
msgstr ""
1742
1355
1743
1356
#: ../ubuntu-packaging-guide/libraries.rst:36
1744
1357
# a1ec3bc9d692403ab82b43da77562aae
1745
1358
msgid "We will use libnova as an example::"
1746
1359
msgstr ""
1747
1360
1748
1361
#: ../ubuntu-packaging-guide/libraries.rst:41
1749
1362
# cd3c9fa86411468aaf013cfabc0fdb33
1750
1363
msgid "To find the SONAME of the library run"
1751
1364
msgstr ""
1752
1365
1753
1366
#: ../ubuntu-packaging-guide/libraries.rst:43
1754
1367
# 0af012c44f39480b8014cfa20b67b08f
1755
1368
msgid "$ readelf -a /usr/lib/libnova-0.12.so.2 | grep SONAME"
1756
1369
msgstr ""
1757
1370
1758
1371
#: ../ubuntu-packaging-guide/libraries.rst:45
1759
1372
# 379239ed35f840b1b788703c94ef817f
1760
1373
msgid "The SONAME is ``libnova-0.12.so.2``, which matches the file name (usually the case but not always). Here upstream has put the upstream version number as part of the SONAME and given it an ABI version of ``2``.  Library package names should follow the SONAME of the library they contain. The library binary package is called ``libnova-0.12-2`` where ``libnova-0.12`` is the name of the library and ``2`` is our ABI number."
1761
1374
msgstr ""
1762
1375
1763
1376
#: ../ubuntu-packaging-guide/libraries.rst:52
1764
1377
# 122c0516404646858c5e64bbaf93311e
1765
1378
msgid "If upstream makes incompatible changes to their library they will have to reversion their SONAME and we will have to rename our library.  Any other packages using our library package will need to recompiled against the new version, this is called a transition and can take some effort. Hopefully our ABI number will continue to match upstream's SONAME but sometimes they introduce incompatibilities without changing their version number and we will need to change ours."
1766
1379
msgstr ""
1767
1380
1768
1381
#: ../ubuntu-packaging-guide/libraries.rst:60
1769
1382
# 5bb0db11faef4045a6ffa4ff6a360ada
1770
1383
msgid "Looking in debian/libnova-0.12-2.install we see it includes two files::"
1771
1384
msgstr ""
1772
1385
1773
1386
#: ../ubuntu-packaging-guide/libraries.rst:65
1774
1387
# e694ef09fee449688473a2417d7e4de3
1775
1388
msgid "The last one is the actual library, complete with minor and point version number.  The first one is a symlink which points to the actual library.  The symlink is what programmes using the library will look for, the running programmes do not care about the minor version number."
1776
1389
msgstr ""
1777
1390
1778
1391
#: ../ubuntu-packaging-guide/libraries.rst:70
1779
1392
# 4806076bc944430598072095813eaf39
1780
1393
msgid "``libnova-dev.install`` includes all the files needed to compile a programme with this library.  Header files, a config binary, the ``.la`` libtool file and ``libnova.so`` which is another symlink pointing at the library, programmes compiling against the library do not care about the major version number (although the binary they compile into will)."
1781
1394
msgstr ""
1782
1395
1783
1396
#: ../ubuntu-packaging-guide/libraries.rst:76
1784
1397
# 4d4773c47d50413e9e4c9f1163445e3c
1785
1398
msgid "``.la`` libtool files are needed on some non-Linux systems with poor library support but usually cause more problems than they solve on Debian systems.  It is a current `Debian goal to remove .la files`_ and we should help with this."
1786
1399
msgstr ""
1787
1400
1788
1401
#: ../ubuntu-packaging-guide/libraries.rst:82
1789
1402
# 4cffd2fb14c64c8abca846161203f289
1790
1403
msgid "Static Libraries"
1791
1404
msgstr ""
1792
1405
1793
1406
#: ../ubuntu-packaging-guide/libraries.rst:84
1794
1407
# 6ccaf98902504122aa73d033cac53220
1795
1408
msgid "The -dev package also ships ``usr/lib/libnova.a``.  This is a static library, an alternative to the shared library.  Any programme compiled against the static library will include the code directory into itself.  This gets round worrying about binary compatibility of the library.  However it also means that any bugs, including security issues, will not be updated along with the libary until the programme is recompiled.  For this reason programmes using static libraries are discouraged."
1796
1409
msgstr ""
1797
1410
1798
1411
#: ../ubuntu-packaging-guide/libraries.rst:94
1799
1412
# 398bf230fe85495fb24337ec903082d5
1800
1413
msgid "Symbol Files"
1801
1414
msgstr ""
1802
1415
1803
1416
#: ../ubuntu-packaging-guide/libraries.rst:96
1804
1417
# 870880e5a31c40b2a6c33ca619012e39
1805
1418
msgid "When a package builds against a library the ``shlibs`` mechanism will add a package dependency on that library.  This is why most programmes will have ``Depends: ${shlibs:Depends}`` in ``debian/control``.  That gets replaced with the library dependencies at build time.  However shlibs can only make it depend on the major ABI version number, ``2`` in our libnova example, so if new symbols get added in libnova 2.1 a programme using these symbols could still be installed against libnova ABI 2.0 which would then crash."
1806
1419
msgstr ""
1807
1420
1808
1421
#: ../ubuntu-packaging-guide/libraries.rst:104
1809
1422
# e6474afb8a8841ea8e5f50f6d3c97cdb
1810
1423
msgid "To make the library dependencies more precise we keep ``.symbols`` files that list all the symbols in a library and the version they appeared in."
1811
1424
msgstr ""
1812
1425
1813
1426
#: ../ubuntu-packaging-guide/libraries.rst:107
1814
1427
# 959ea7b001924fc0a6686b13140ea5c9
1815
1428
msgid "libnova has no symbols file so we can create one.  Start by compiling the package::"
1816
1429
msgstr ""
1817
1430
1818
1431
#: ../ubuntu-packaging-guide/libraries.rst:112
1819
1432
# e06fccd8d4ab438a95bedf83eea74599
1820
1433
msgid "The ``-nc`` will cause it to finish at the end of the compile without removing the build.  Change to the build and run ``dpkg-gensymbols`` for the library package::"
1821
1434
msgstr ""
1822
1435
1823
1436
#: ../ubuntu-packaging-guide/libraries.rst:119
1824
1437
# 05828480fd53405699d8ad8a89aee466
1825
1438
msgid "This makes a diff file which you can self apply::"
1826
1439
msgstr ""
1827
1440
1828
1441
#: ../ubuntu-packaging-guide/libraries.rst:123
1829
1442
# 247935b3befb47f78155de9bf6b4a97e
1830
1443
msgid "Which will create a file named similar to ``dpkg-gensymbolsnY_WWI`` that lists all the symbols.  It also lists the current package version.  We can remove the packaging version from that listed in the symbols file because new symbols are not generally added by new packaging versions::"
1831
1444
msgstr ""
1832
1445
1833
1446
#: ../ubuntu-packaging-guide/libraries.rst:130
1834
1447
# e6a01960a5b94448a8463cfbac6b2dd4
1835
1448
msgid "Now move the file into its location, commit and do a test build::"
1836
1449
msgstr ""
1837
1450
1838
1451
#: ../ubuntu-packaging-guide/libraries.rst:138
1839
1452
# f14902b00f9541f3a5065bc0dac139c1
1840
1453
msgid "If it successfully compiles the symbols file is correct.  With the next upstream version of libnova you would run dpkg-gensymbols again and it will give a diff to update the symbols file."
1841
1454
msgstr ""
1842
1455
1843
1456
#: ../ubuntu-packaging-guide/libraries.rst:143
1844
1457
# 98b9e46b70e8436cb84a7901e53db11a
1845
1458
msgid "C++ Library Symbols Files"
1846
1459
msgstr ""
1847
1460
1848
1461
#: ../ubuntu-packaging-guide/libraries.rst:145
1849
1462
# 77dfecd2e3ca4500a800a0637fef9f7a
1850
1463
msgid "C++ has even more exacting standards of binary compatibility than C.  The Debian Qt/KDE Team maintain some scripts to handle this, see their `Working with symbols files`_ page for how to use them."
1851
1464
msgstr ""
1852
1465
1853
1466
#: ../ubuntu-packaging-guide/libraries.rst:150
1854
1467
# b21519bcb125410b9494569ca65edef2
1855
1468
msgid "Further Reading"
1856
1469
msgstr ""
1857
1470
1858
1471
#: ../ubuntu-packaging-guide/libraries.rst:152
1859
1472
# cacbb05f8e934e378c081170f0d24d74
1860
1473
msgid "Junichi Uekawa's `Debian Library Packaging Guide`_ goes into this topic in more detail."
1861
1474
msgstr ""
1862
1475
1863
1476
#: ../ubuntu-packaging-guide/packaging-new-software.rst:3
1864
1477
# 9d2486bdfc7e487e9b8af112c9316924
1865
1478
msgid "Packaging New Software"
1866
1479
msgstr ""
1867
1480
1868
1481
#: ../ubuntu-packaging-guide/packaging-new-software.rst:5
1869
1482
# 59fba311ff094ebcb043d86060dd02b4
1870
1483
msgid "While there are thousands of packages in the Ubuntu archive, there are still a lot nobody has gotten to yet. If there is an exciting new piece of software that you feel needs wider exposure, maybe you want to try your hand at creating a package for Ubuntu or a PPA. This guide will take you through the steps of packaging new software."
1871
1484
msgstr ""
1872
1485
1873
1486
#: ../ubuntu-packaging-guide/packaging-new-software.rst:12
1874
1487
# 0aa343b58400430ea898e6d0bfd9de8d
1875
1488
msgid "Checking the Programme"
1876
1489
msgstr ""
1877
1490
1878
1491
#: ../ubuntu-packaging-guide/packaging-new-software.rst:14
1879
1492
# 4c0b9a06c0504ea38a1e32b0ae28ffd4
1880
1493
msgid "The first stage in packaging is to get the released tar from upstream (we call the authors of applications \"upstream\") and check that it compiles and runs."
1881
1494
msgstr ""
1882
1495
1883
1496
#: ../ubuntu-packaging-guide/packaging-new-software.rst:17
1884
1497
# 6c13fecc7fee401fbbdf0ec8ab90982f
1885
1498
msgid "This guide will take you through packaging a simple application called KQRCode which has been `posted on KDE-apps.org`_.  Download `version 0.4 from Sourceforge`_ and put it in a new directory."
1886
1499
msgstr ""
1887
1500
1888
1501
#: ../ubuntu-packaging-guide/packaging-new-software.rst:21
1889
1502
# 400f126b6d35496698950fa9a7b804a4
1890
1503
msgid "Now uncompress it::"
1891
1504
msgstr ""
1892
1505
1893
1506
#: ../ubuntu-packaging-guide/packaging-new-software.rst:26
1894
1507
# 92f40d14bcdc4f5cafad97c347d58e0c
1895
1508
msgid "This application uses the CMake build system so we want to run cmake to prepare for compilation::"
1896
1509
msgstr ""
1897
1510
1898
1511
#: ../ubuntu-packaging-guide/packaging-new-software.rst:33
1899
1512
# 08f8ef0e76a44a4f88c2a4d60ab6bb1f
1900
1513
msgid "CMake will check for the required dependencies, in this case it tells us we need Qt and KDE libraries.  We also need GCC, packagers can install ``build-essential`` which brings this in and is assumed to be installed for all packages. If you do not have the development files for these libraries installed it will fail, you can install them and run CMake again::"
1901
1514
msgstr ""
1902
1515
1903
1516
#: ../ubuntu-packaging-guide/packaging-new-software.rst:42
1904
1517
# c788bb971799420e940f9317d82e574a
1905
1518
msgid "Now you can compile the source::"
1906
1519
msgstr ""
1907
1520
1908
1521
#: ../ubuntu-packaging-guide/packaging-new-software.rst:46
1909
1522
# 9f9b99040e684a8ca7b157fa2539133b
1910
1523
msgid "Running this gives some errors about missing headers.  This means there are other libraries missing which were not checked by CMake.  Make a note to inform upstream of this problem.  `packages.ubuntu.com`_ can be used to find which packages these headers come from, install these packages and continue the compile::"
1911
1524
msgstr ""
1912
1525
1913
1526
#: ../ubuntu-packaging-guide/packaging-new-software.rst:55
1914
1527
# d78b9316c1ee4c77852e7d26ec46b8c5
1915
1528
msgid "If the compile completes successfully you can install and run the programme::"
1916
1529
msgstr ""
1917
1530
1918
1531
#: ../ubuntu-packaging-guide/packaging-new-software.rst:61
1919
1532
# ac725bc6291b415c8b6b6de3d9290eed
1920
1533
msgid "Starting a Package"
1921
1534
msgstr ""
1922
1535
1923
1536
#: ../ubuntu-packaging-guide/packaging-new-software.rst:63
1924
1537
# aedb86fe4f8241a8843892eb97599ff0
1925
1538
msgid "``bzr-builddeb`` includes a plugin to create a new package from a template, the plugin is a wrapper around the ``dh_make`` command::"
1926
1539
msgstr ""
1927
1540
1928
1541
#: ../ubuntu-packaging-guide/packaging-new-software.rst:69
1929
1542
# 187e6290a2f94d9ebff13d1b65a2fa99
1930
1543
msgid "When it asks what type of package type ``s`` for single binary."
1931
1544
msgstr ""
1932
1545
1933
1546
#: ../ubuntu-packaging-guide/packaging-new-software.rst:71
1934
1547
# 03268a6b1a54434abb8de4bccd4391f6
1935
1548
msgid "This will import the code into a branch and add the ``debian/`` packaging directory.  Have a look at the contents.  Most of the files it adds are only needed for specialist packages (such as Emacs modules) so you can start by removing the optional example files::"
1936
1549
msgstr ""
1937
1550
1938
1551
#: ../ubuntu-packaging-guide/packaging-new-software.rst:79
1939
1552
# 48e36e15ca254116907f8a77750fdd09
1940
1553
msgid "You should now customise each of the files."
1941
1554
msgstr ""
1942
1555
1943
1556
#: ../ubuntu-packaging-guide/packaging-new-software.rst:81
1944
1557
# f9ab5fc134fb4cee8e32e556a07fe586
1945
1558
msgid "In ``debian/changelog`` change the version number to an Ubuntu version: ``0.4-0ubuntu1`` (upstream version 0.4, Debian version 0, Ubuntu version 1).  Also change ``unstable`` to the current development Ubuntu release such as ``oneiric``."
1946
1559
msgstr ""
1947
1560
1948
1561
#: ../ubuntu-packaging-guide/packaging-new-software.rst:86
1949
1562
# 68fb6f78c08c49c7aacf1a866b5c1480
1950
1563
msgid "Much of the package building work is done by a series of scripts called ``debhelper``.  The exact behaviour of ``debhelper`` changes with new major versions, the compat file instructs ``debhelper`` which version to act as.  You will generally want to set this to the most recent version which is ``8``."
1951
1564
msgstr ""
1952
1565
1953
1566
#: ../ubuntu-packaging-guide/packaging-new-software.rst:92
1954
1567
# bf0f078ee9fe47c7a49fcc96065db39d
1955
1568
msgid "``control`` contains all the metadata of the package.  The first paragraph describes the source package.  The second and and following paragraphs describe the binary packages to be built.  We will need to add the packages needed to compile the application to ``Build-Depends:`` so set that to::"
1956
1569
msgstr ""
1957
1570
1958
1571
#: ../ubuntu-packaging-guide/packaging-new-software.rst:100
1959
1572
# 6b883941eafb476589f23774b2b01bfc
1960
1573
msgid "You will also need to fill in a description of the programme in the ``Description:`` field."
1961
1574
msgstr ""
1962
1575
1963
1576
#: ../ubuntu-packaging-guide/packaging-new-software.rst:103
1964
1577
# 208710fb26b4452184d399e77c4cb867
1965
1578
msgid "``copyright`` needs to be filled in to follow the licence of the upstream source.  According to the kqrcode/COPYING file this is GNU GPL 3 or later."
1966
1579
msgstr ""
1967
1580
1968
1581
#: ../ubuntu-packaging-guide/packaging-new-software.rst:106
1969
1582
# 0012e8d84be04d68b3038b628e5ccbc2
1970
1583
msgid "``docs`` contains any upstream documentation files you think should be included in the final package."
1971
1584
msgstr ""
1972
1585
1973
1586
#: ../ubuntu-packaging-guide/packaging-new-software.rst:109
1974
1587
# 756545d85bcc40c1a333e2b35f275b7b
1975
1588
msgid "``README.source`` and ``README.Debian`` are only needed if your package has any non-standard features, we don't so you can delete them."
1976
1589
msgstr ""
1977
1590
1978
1591
#: ../ubuntu-packaging-guide/packaging-new-software.rst:112
1979
1592
# 312f3c37d8b14073a30458410e26a220
1980
1593
msgid "``source/format`` can be left as is, this describes the version format of the source package and should be ``3.0 (quilt)``."
1981
1594
msgstr ""
1982
1595
1983
1596
#: ../ubuntu-packaging-guide/packaging-new-software.rst:115
1984
1597
# 7a915cabe45d47e996bb9a6b61cabc91
1985
1598
msgid "``rules`` is the most complex file.  This is a Makefile which compiles the code and turns it into a binary package.  Fortunately most of the work is automatically done these days by ``debhelper 7`` so the universal ``%`` Makefile target just runs the ``dh`` script which will run everything needed."
1986
1599
msgstr ""
1987
1600
1988
1601
#: ../ubuntu-packaging-guide/packaging-new-software.rst:120
1989
1602
# a8fb1e2bc95642288d7a16a784fc733c
1990
1603
msgid "Finally commit the code to your packaging branch::"
1991
1604
msgstr ""
1992
1605
1993
1606
#: ../ubuntu-packaging-guide/packaging-new-software.rst:125
1994
1607
#: ../ubuntu-packaging-guide/udd-working.rst:69
1995
1608
# d2c0b4d8d90b48b19f2c373ed55eab75
1996
1609
# ecfe8d82e2114f7fb824b8b17e491ce6
1997
1610
msgid "Building the package"
1998
1611
msgstr ""
1999
1612
2000
1613
#: ../ubuntu-packaging-guide/packaging-new-software.rst:127
2001
1614
# 0d02d6cbb00c4afd912ded7a8cbd2ae1
2002
1615
msgid "Now we need to check that our packaging successfully compiles the package and builds the .deb binary package::"
2003
1616
msgstr ""
2004
1617
2005
1618
#: ../ubuntu-packaging-guide/packaging-new-software.rst:132
2006
1619
# 37b8625fff6b4efcba2587de14621e20
2007
1620
msgid "``debuild`` is a command to build the package in its current location.  The ``-us -uc`` tell it there is not need to GPG sign the compile.  The result will be placed in ``..``."
2008
1621
msgstr ""
2009
1622
2010
1623
#: ../ubuntu-packaging-guide/packaging-new-software.rst:136
2011
1624
# d4b4cf3877124f738e8501904b60a80c
2012
1625
msgid "You can view the contents of the package with::"
2013
1626
msgstr ""
2014
1627
2015
1628
#: ../ubuntu-packaging-guide/packaging-new-software.rst:140
2016
1629
# 6fc445d27f0149098cf9e27f81b0bfaa
2017
1630
msgid "Install the package and check it works::"
2018
1631
msgstr ""
2019
1632
2020
1633
#: ../ubuntu-packaging-guide/packaging-new-software.rst:145
2021
1634
# 0b7a2d16133847e9aacff428d788ceaa
2022
1635
msgid "Next Steps"
2023
1636
msgstr ""
2024
1637
2025
1638
#: ../ubuntu-packaging-guide/packaging-new-software.rst:147
2026
1639
# b5d75f5868754b4596d239d6f5556d92
2027
1640
msgid "Even if it builds the .deb binary package, your packaging may have bugs.  Many errors can be automatically detected by our tool ``lintian`` which can be run on both the source .dsc metadata file and the .deb binary package::"
2028
1641
msgstr ""
2029
1642
2030
1643
#: ../ubuntu-packaging-guide/packaging-new-software.rst:155
2031
1644
# 662bd4ddf12449c49cab0687ed1bfed7
2032
1645
msgid "A description of each of the problems it reports can be found on the `lintian website`_."
2033
1646
msgstr ""
2034
1647
2035
1648
#: ../ubuntu-packaging-guide/packaging-new-software.rst:158
2036
1649
# f20bba2b62e14567b1fbb57eb23214b4
2037
1650
msgid "After making a fix to the packaging you can rebuild using ``-nc`` \"no clean\" without having to build from scratch::"
2038
1651
msgstr ""
2039
1652
2040
1653
#: ../ubuntu-packaging-guide/packaging-new-software.rst:163
2041
1654
# 1a81beef68d64e798a6d81cccb660f4e
2042
1655
msgid "Having checked that the package builds locally you should ensure it builds on a clean system using ``pbuilder``::"
2043
1656
msgstr ""
2044
1657
2045
1658
#: ../ubuntu-packaging-guide/packaging-new-software.rst:170
2046
1659
# 17ae18ca6a564c998abd447254e188f7
2047
1660
msgid "When you are happy with your package you will want others to review it.  You can upload the branch to Launchpad for review::"
2048
1661
msgstr ""
2049
1662
2050
1663
#: ../ubuntu-packaging-guide/packaging-new-software.rst:175
2051
1664
# 17392b1fff004e2493366c5fcadcb1c0
2052
1665
msgid "Uploading it to a PPA (Personal Package Archive) will ensure it builds and give an easy way for you and others to test the binary packages. You will need to set up a PPA in Launchad then upload with ``dput``::"
2053
1666
msgstr ""
2054
1667
2055
1668
#: ../ubuntu-packaging-guide/packaging-new-software.rst:181
2056
1669
# c8c0618209c2424d9beac381d3b024f6
2057
1670
msgid "See :doc:`uploading<./udd-uploading>` for more information."
2058
1671
msgstr ""
2059
1672
2060
1673
#: ../ubuntu-packaging-guide/packaging-new-software.rst:183
2061
1674
# 8ab83f0bc099482593d87bec8daf50ce
2062
1675
msgid "You can ask for reviews in ``#ubuntu-motu`` IRC channel, or on the `MOTU mailing list`_.  There might also be a more specific team you could ask such as the Kubuntu team for KDE packages."
2063
1676
msgstr ""
2064
1677
2065
1678
#: ../ubuntu-packaging-guide/packaging-new-software.rst:188
2066
1679
# 9529cb8f705547dc95d7d25c82e857f7
2067
1680
msgid "Submitting for inclusion"
2068
1681
msgstr ""
2069
1682
2070
1683
#: ../ubuntu-packaging-guide/packaging-new-software.rst:190
2071
1684
# 87fc979533c04e45992453914d17a982
2072
1685
msgid "There are a number of paths that a package can take to enter Ubuntu. In most cases, going through Debian first can be the best path. This way ensures that your package will reach the largest number of users as it will be available in not just Debian and Ubuntu but all of their derivatives as well. Here are some useful links for submitting new packages to Debian:"
2073
1686
msgstr ""
2074
1687
2075
1688
#: ../ubuntu-packaging-guide/packaging-new-software.rst:197
2076
1689
# 03d85c092776496ab0969fd84fd973c7
2077
1690
msgid "`Debian Mentors FAQ`_ - debian-mentors is for the mentoring of new and prospective Debian Developers. It is where you can find a sponsor to upload your package to the archive."
2078
1691
msgstr ""
2079
1692
2080
1693
#: ../ubuntu-packaging-guide/packaging-new-software.rst:201
2081
1694
# be95ee15b6f840a8be29c9a24eee784c
2082
1695
msgid "`Work-Needing and Prospective Packages`_ - Information on how to file \"Intent to Package\" and \"Request for Package\" bugs as well as list of open ITPs and RFPs."
2083
1696
msgstr ""
2084
1697
2085
1698
#: ../ubuntu-packaging-guide/packaging-new-software.rst:205
2086
1699
# 7bfbf158bcc445d6afbdc51a8bbce4e0
2087
1700
msgid "`Debian Developer's Reference, 5.1. New packages`_ - The entire document is invaluable for both Ubuntu and Debian packagers. This section documents processes for sumbitting new packages."
2088
1701
msgstr ""
2089
1702
2090
1703
#: ../ubuntu-packaging-guide/packaging-new-software.rst:209
2091
1704
# 04f7ce3e6a144369bd5a0de44748fc8f
2092
1705
msgid "In some cases, it might make sense to go directly into Ubuntu first. For instance, Debian might be in a freeze making it unlikely that you're package will make it into Ubuntu in time for the next release. This process is documented on the `\"New Packages\" section of the Ubuntu wiki`_."
2093
1706
msgstr ""
2094
1707
2095
1708
#: ../ubuntu-packaging-guide/patches-to-packages.rst:3
2096
1709
# 2241baf03ca34a08b7d7e3fdda30ced7
2097
1710
msgid "Patches to Packages"
2098
1711
msgstr ""
2099
1712
2100
1713
#: ../ubuntu-packaging-guide/patches-to-packages.rst:5
2101
1714
# 5c3751ca50de4e1387fa501b03bf1eb5
2102
1715
msgid "Sometimes, Ubuntu package maintainers have to change the upstream source code in order to make it work properly on Ubuntu.  Examples include, patches to upstream that haven't yet made it into a released version, or changes to the upstream's build system needed only for building it on Ubuntu.  We could change the upstream source code directly, but doing this makes it more difficult to remove the patches later when upstream has incorporated them, or extract the change to submit to the upstream project.  Instead, we keep these changes as separate patches, in the form of diff files."
2103
1716
msgstr ""
2104
1717
2105
1718
#: ../ubuntu-packaging-guide/patches-to-packages.rst:14
2106
1719
# 1a8dc2ea6df045c791f0924de1eba7a3
2107
1720
msgid "There are a number of different ways of handling patches in Debian packages, fortunately we are standardising on one system, `Quilt`_, which is now used by most packages."
2108
1721
msgstr ""
2109
1722
2110
1723
#: ../ubuntu-packaging-guide/patches-to-packages.rst:18
2111
1724
# 36be977d3c7b4b27ac83f787d1c20ba6
2112
1725
msgid "Let's look at an example package, ``kamoso`` in Natty::"
2113
1726
msgstr ""
2114
1727
2115
1728
#: ../ubuntu-packaging-guide/patches-to-packages.rst:22
2116
1729
# 5529f33d3d0b478fac7ea68ab8405610
2117
1730
msgid "The patches are kept in ``debian/patches``.  This package has one patch ``kubuntu_01_fix_qmax_on_armel.diff`` to fix a compile failure on ARM.  The patch has been given a name to describe what it does, a number to keep the patches in order (two patches can overlap if they change the same file) and in this case the Kubuntu team adds their own prefix to show the patch comes from them rather than from Debian."
2118
1731
msgstr ""
2119
1732
2120
1733
#: ../ubuntu-packaging-guide/patches-to-packages.rst:29
2121
1734
# e635b7e963bb4caeac48400b23c7811f
2122
1735
msgid "The order of patches to apply is kept in ``debian/patches/series``."
2123
1736
msgstr ""
2124
1737
2125
1738
#: ../ubuntu-packaging-guide/patches-to-packages.rst:32
2126
1739
# b694697d5a60411bb2c7dc37ed4675f0
2127
1740
msgid "Patches with Quilt"
2128
1741
msgstr ""
2129
1742
2130
1743
#: ../ubuntu-packaging-guide/patches-to-packages.rst:34
2131
1744
# 6bb7b69eac2346bf980295dbddc298c4
2132
1745
msgid "Before working with Quilt you need to tell it where to find the patches.  Add this to your ``~/.bashrc``::"
2133
1746
msgstr ""
2134
1747
2135
1748
#: ../ubuntu-packaging-guide/patches-to-packages.rst:39
2136
1749
# cbac6263b89f4e62bcfae1a183202ab1
2137
1750
msgid "And source the file to apply the new export::"
2138
1751
msgstr ""
2139
1752
2140
1753
#: ../ubuntu-packaging-guide/patches-to-packages.rst:43
2141
1754
# 90e75b21038b415cb7124b81a3119dd0
2142
1755
msgid "By default all patches are applied already to UDD checkouts or downloaded packages.  You can check this with::"
2143
1756
msgstr ""
2144
1757
2145
1758
#: ../ubuntu-packaging-guide/patches-to-packages.rst:49
2146
1759
# d4faacee0f964e4a9beebcae8a1def6f
2147
1760
msgid "If you wanted to remove the patch you would run ``pop``::"
2148
1761
msgstr ""
2149
1762
2150
1763
#: ../ubuntu-packaging-guide/patches-to-packages.rst:57
2151
1764
# 7d2578ea2fb3424ba9f76dfb56642311
2152
1765
msgid "And to apply a patch you use ``push``::"
2153
1766
msgstr ""
2154
1767
2155
1768
#: ../ubuntu-packaging-guide/patches-to-packages.rst:67
2156
1769
# 3920a9d86b834234be836b63f21ab810
2157
1770
msgid "Adding a New Patch"
2158
1771
msgstr ""
2159
1772
2160
1773
#: ../ubuntu-packaging-guide/patches-to-packages.rst:69
2161
1774
# fb390d3c3be349cdb600350811c9671d
2162
1775
msgid "To add a new patch you need to tell Quilt to create a new patch, tell it which files that patch should change, edit the files then refresh the patch::"
2163
1776
msgstr ""
2164
1777
2165
1778
#: ../ubuntu-packaging-guide/patches-to-packages.rst:81
2166
1779
# 9041df0abe5140678fe386d7d4b9b92c
2167
1780
msgid "The ``quilt add`` step is important, if you forget it the files will not end up in the patch."
2168
1781
msgstr ""
2169
1782
2170
1783
#: ../ubuntu-packaging-guide/patches-to-packages.rst:84
2171
1784
# 9e80030f1eb6438a9bc24959f9cfac5d
2172
1785
msgid "The change will now be in ``debian/patches/kubuntu_02_programme_description.diff`` and the ``series`` file will have had the new patch added to it.  You should add the new file to the packaging::"
2173
1786
msgstr ""
2174
1787
2175
1788
#: ../ubuntu-packaging-guide/patches-to-packages.rst:94
2176
1789
# 6f36a309febe4b4b83ff777007dc4901
2177
1790
msgid "Quilt keeps its metadata in the ``.pc/`` directory, so currently you need to add that to the packaging too.  This should be improved in future."
2178
1791
msgstr ""
2179
1792
2180
1793
#: ../ubuntu-packaging-guide/patches-to-packages.rst:97
2181
1794
# c25ed33cbb694bb5ab2fd2719f11adef
2182
1795
msgid "As a general rule you should be careful adding patches to programmes unless they come from upstream, there is often a good reason why that change has not already been made.  The above example changes a user interface string for example, so it would break all translations.  If in doubt, do ask the upstream author before adding a patch."
2183
1796
msgstr ""
2184
1797
2185
1798
#: ../ubuntu-packaging-guide/patches-to-packages.rst:104
2186
1799
# a9bcd232fe19471a8dd3bc40ac48ec2a
2187
1800
msgid "Upgrading to New Upstream Versions"
2188
1801
msgstr ""
2189
1802
2190
1803
#: ../ubuntu-packaging-guide/patches-to-packages.rst:106
2191
1804
# df088161eeb042c1a7a74ac49eaa923b
2192
1805
msgid "When you upgrade to a new upstream version, patches will often become out of date.  They might need to be refreshed to match the new upstream source or they might need to be removed altogether."
2193
1806
msgstr ""
2194
1807
2195
1808
#: ../ubuntu-packaging-guide/patches-to-packages.rst:110
2196
1809
# 870e3c1c96724cc1a4f9ca814cddf71b
2197
1810
msgid "You should start by ensuring no patches are applied.  Unfortunately a commit is needed before you can merge in the new upstream (this is `bug 815854`_::"
2198
1811
msgstr ""
2199
1812
2200
1813
#: ../ubuntu-packaging-guide/patches-to-packages.rst:116
2201
1814
# 01d84a0499414f2a8f7e73acf0c14f58
2202
1815
msgid "Then upgrade to the new version"
2203
1816
msgstr ""
2204
1817
2205
1818
#: ../ubuntu-packaging-guide/patches-to-packages.rst:118
2206
1819
# 060a7d5c6b1e42a2bdfe566bd96e126d
2207
1820
msgid "$ bzr merge-upstream --version 2.0.2 https://launchpad.net/ubuntu/+archive/primary/+files/kamoso_2.0.2.orig.tar.bz2"
2208
1821
msgstr ""
2209
1822
2210
1823
#: ../ubuntu-packaging-guide/patches-to-packages.rst:120
2211
1824
# 61de3ecb174b44daa1ef323e29f1b9da
2212
1825
msgid "Then apply the patches one at a time to check for problems::"
2213
1826
msgstr ""
2214
1827
2215
1828
#: ../ubuntu-packaging-guide/patches-to-packages.rst:129
2216
1829
# 5d35e1273bbd4487a49ec82a1dd0607b
2217
1830
msgid "If it can be reverse-applied this means the patch has been applied already by upstream, so we can delete the patch::"
2218
1831
msgstr ""
2219
1832
2220
1833
#: ../ubuntu-packaging-guide/patches-to-packages.rst:135
2221
1834
# b0bfdc2a871f47538cdc0d72eaab11d4
2222
1835
msgid "Then carry on::"
2223
1836
msgstr ""
2224
1837
2225
1838
#: ../ubuntu-packaging-guide/patches-to-packages.rst:140
2226
1839
# eb92e1c67e134b738c41bec49059cc7c
2227
1840
msgid "It is a good idea to run refresh, this will update the patch relative to the changed upstream source::"
2228
1841
msgstr ""
2229
1842
2230
1843
#: ../ubuntu-packaging-guide/patches-to-packages.rst:146
2231
1844
# 8ad4cf528b9d4543b6a610c13ffdd227
2232
1845
msgid "Then commit as usual::"
2233
1846
msgstr ""
2234
1847
2235
1848
#: ../ubuntu-packaging-guide/patches-to-packages.rst:152
2236
1849
# 6f2cbc44cb544b2ebdfe54bda2edb7fc
2237
1850
msgid "Making A Package Use Quilt"
2238
1851
msgstr ""
2239
1852
2240
1853
#: ../ubuntu-packaging-guide/patches-to-packages.rst:154
2241
1854
# 6ca7a58987bb496face3eacc1bfb6f78
2242
1855
msgid "Modern packages use Quilt by default, it is built into the packaging format.  Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``."
2243
1856
msgstr ""
2244
1857
2245
1858
#: ../ubuntu-packaging-guide/patches-to-packages.rst:158
2246
1859
# e49e867c8e604b53a561bf92af15f40e
2247
1860
msgid "Older packages using source format 1.0 will need to explicitly use Quilt, usually by including a makefile into ``debian/rules``."
2248
1861
msgstr ""
2249
1862
2250
1863
#: ../ubuntu-packaging-guide/patches-to-packages.rst:163
2251
1864
# d91974b6f93a4ebc83b3ebdff6a5d578
2252
1865
msgid "Other Patch Systems"
2253
1866
msgstr ""
2254
1867
2255
1868
#: ../ubuntu-packaging-guide/patches-to-packages.rst:165
2256
1869
# 95e9287c4e5b4d8eb3aebe3f6f3342e3
2257
1870
msgid "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-patchsys``, these work similarly to Quilt by keeping patches in debian/patches but have different commands to apply, unapply or create patches. You can use ``edit-patch``, shown in previous chapters, as a reliable way to work with all systems."
2258
1871
msgstr ""
2259
1872
2260
1873
#: ../ubuntu-packaging-guide/patches-to-packages.rst:171
2261
1874
# f38c643c88ec478f8dffd3c0b3b6107b
2262
1875
msgid "Even older packages will include changes directly to sources and kept in the ``diff.gz`` source file.  This makes it hard to upgrade to new upstream versions or differentiate between patches and is best avoided."
2263
1876
msgstr ""
2264
1877
2265
1878
#: ../ubuntu-packaging-guide/patches-to-packages.rst:175
2266
1879
# 9520c1dcd3714fcbb7cd1a4123db0488
2267
1880
msgid "Bazaar Loom is a way to keep patches as part of bzr trees, see :doc:`Working with Patches via Loom<./udd-patchsys>` for more information."
2268
1881
msgstr ""
2269
1882
2270
1883
#: ../ubuntu-packaging-guide/patches-to-packages.rst:178
2271
1884
# 44bb230bde8243e88d02160fafeb25e1
2272
1885
msgid "Do not change a package's patch system without discussing it with the Debian maintainer or relevant Ubuntu team.  If there is no existing patch system then feel free to add Quilt."
2273
1886
msgstr ""
2274
1887
2275
1888
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:3
2276
1889
# fcaa66fc4d6e4c70a68f6edce85a973f
2277
1890
msgid "Security and Stable Release Updates"
2278
1891
msgstr ""
2279
1892
2280
1893
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:6
2281
1894
# 44937136520b417ab88d6f9dca66a583
2282
1895
msgid "Fixing a Security Bug in Ubuntu"
2283
1896
msgstr ""
2284
1897
2285
1898
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:11
2286
1899
# 6ea8baeb570c49fe81e30b93b0106a86
2287
1900
msgid "Fixing security bugs in Ubuntu is not really any different than :doc:`fixing a regular bug in Ubuntu<./fixing-a-bug>`, and it is assumed that you are familiar with patching normal bugs. To demonstrate where things are different, we will be updating the dbus package in Ubuntu 10.04 LTS (Lucid Lynx) for a security update."
2288
1901
msgstr ""
2289
1902
2290
1903
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:19
2291
1904
# b2012d850e594307ab0fc8ff75da7070
2292
1905
msgid "Obtaining the source"
2293
1906
msgstr ""
2294
1907
2295
1908
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:21
2296
1909
# 50cca424f3334607971cf3b684408134
2297
1910
msgid "In this example, we already know we want to fix the dbus package in Ubuntu 10.04 LTS (Lucid Lynx). So first you need to determine the version of the package you want to download. We can use the ``rmadison`` to help with this::"
2298
1911
msgstr ""
2299
1912
2300
1913
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:30
2301
1914
# 160e2724f58a49d29b12dc794073fce9
2302
1915
msgid "Typically you will want to choose the highest version for the release you want to patch that is not in -proposed or -backports. Since we are updating Lucid's dbus, you'll download 1.2.16-2ubuntu4.2 from lucid-updates::"
2303
1916
msgstr ""
2304
1917
2305
1918
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:38
2306
1919
# f1c7e672c4d04f32bf8fd5455422f789
2307
1920
msgid "Patching the source"
2308
1921
msgstr ""
2309
1922
2310
1923
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:39
2311
1924
# 69bcfabad54d4339bef655df9d2b1001
2312
1925
msgid "Now that we have the source package, we need to patch it to fix the vulnerability. You may use whatever patch method that is appropriate for the package, including :doc:`UDD techniques<./udd-intro>`, but this example will use ``edit-patch`` (from the ubuntu-dev-tools package). ``edit-patch`` is the easiest way to patch packages and it is basically a wrapper around every other patch system you can imagine."
2313
1926
msgstr ""
2314
1927
2315
1928
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:46
2316
1929
# e3377b23d7a547cdaabdf4606ad86234
2317
1930
msgid "To create your patch using ``edit-patch``::"
2318
1931
msgstr ""
2319
1932
2320
1933
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:51
2321
1934
# ea53b2134aae47fb9c41c935c1c14647
2322
1935
msgid "This will apply the existing patches and put the packaging in a temporary directory. Now edit the files needed to fix the vulnerability.  Often upstream will have provided a patch so you can apply that patch::"
2323
1936
msgstr ""
2324
1937
2325
1938
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:57
2326
1939
# c8f4bfe3fbd94f54b2efdee70bd8ecdd
2327
1940
msgid "Aftering making the necessary changes, you just hit Ctrl-D or type exit to leave the temporary shell."
2328
1941
msgstr ""
2329
1942
2330
1943
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:61
2331
1944
# 3ab2cb5e96cf425c8bb62d682dfb5bef
2332
1945
msgid "Formatting the changelog and patches"
2333
1946
msgstr ""
2334
1947
2335
1948
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:63
2336
1949
# 32cf2e90495e499a88a886c1bbecc26e
2337
1950
msgid "After applying your patches you will want to update the changelog. The ``dch`` command is used to edit the ``debian/changelog`` file and ``edit-patch`` will launch ``dch`` automatically after unapplying all the patches. If you are not using ``edit-patch``, you can launch ``dch -i`` manually. Unlike with regular patches, you should use the following format (note the distribution name uses lucid-security since this is a security update for Lucid) for security updates::"
2338
1951
msgstr ""
2339
1952
2340
1953
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:80
2341
1954
# ed919cc67ea9442dac459f1cc3d64aeb
2342
1955
msgid "Update your patch to use the appropriate patch tags. Your patch should have at a minimum the Origin, Description and Bug-Ubuntu tags. For example, edit debian/patches/99-fix-a-vulnerability.patch to have something like::"
2343
1956
msgstr ""
2344
1957
2345
1958
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:91
2346
1959
# 8e0fc3aa272a4b3baf5f4d3c43643d02
2347
1960
msgid "Multiple vulnerabilities can be fixed in the same security upload; just be sure to use different patches for different vulnerabilities."
2348
1961
msgstr ""
2349
1962
2350
1963
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:95
2351
1964
# 814ea189399a4700901458d9e274c17a
2352
1965
msgid "Test and Submit your work"
2353
1966
msgstr ""
2354
1967
2355
1968
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:97
2356
1969
# f8623540f61643408dee80d6a8d176ab
2357
1970
msgid "At this point the process is the same as for :doc:`fixing a regular bug in Ubuntu<./fixing-a-bug>`. Specifically, you will want to:"
2358
1971
msgstr ""
2359
1972
2360
1973
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:100
2361
1974
# a594d5cc105044b79b691029f7176bb4
2362
1975
msgid "Build your package and verify that it compiles without error and without any added compiler warnings"
2363
1976
msgstr ""
2364
1977
2365
1978
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:102
2366
1979
# 8a246f8802e2464693909bfa93b85323
2367
1980
msgid "Upgrade to the new version of the package from the previous version"
2368
1981
msgstr ""
2369
1982
2370
1983
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:103
2371
1984
# 98467e4df61c444a90c17dada9ab0428
2372
1985
msgid "Test that the new package fixes the vulnerability and does not introduce any regressions"
2373
1986
msgstr ""
2374
1987
2375
1988
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:105
2376
1989
# fd79f702d89e41cd8a66e6c26cfd3cf9
2377
1990
msgid "Submit your work via a Launchpad merge proposal and file a Launchpad bug being sure to mark the bug as a security bug and to subscribe ``ubuntu-security-sponsors``"
2378
1991
msgstr ""
2379
1992
2380
1993
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:109
2381
1994
# 3aee8769d59e4288b13ee8d4f9279cd4
2382
1995
msgid "If the security vulnerability is not yet public then do not file a merge proposal and ensure you mark the bug as private."
2383
1996
msgstr ""
2384
1997
2385
1998
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:112
2386
1999
# 4454e4ec4d504a989350286c1dc011a3
2387
2000
msgid "The filed bug should include a Test Case, i.e. a comment which clearly shows how to recreate the bug by running the old version then how to ensure the bug no longer exists in the new version."
2388
2001
msgstr ""
2389
2002
2390
2003
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:116
2391
2004
# 0ed66335fe214b25b3a214779fa79b47
2392
2005
msgid "The bug report should also confirm that the issue is fixed in Ubuntu versions newer than the one with the proposed fix (in the above example newer than Lucid).  If the issue is not fixed in newer Ubuntu versions you should prepare updates for those versions too."
2393
2006
msgstr ""
2394
2007
2395
2008
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:123
2396
2009
# 9d58c76584ab422aad579dc066f350e9
2397
2010
msgid "Stable Release Updates"
2398
2011
msgstr ""
2399
2012
2400
2013
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:125
2401
2014
# b8c8cef56aa84c5683332a6a4ca34e9d
2402
2015
msgid "We also allow updates to releases where a package has a high impact bug such as a severe regression from a previous release or a bug which could cause data loss.  Due to the potential for such updates to themselves introduce bugs we only allow this where the change can be easily understood and verified."
2403
2016
msgstr ""
2404
2017
2405
2018
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:130
2406
2019
# 17790d066b284657a6f8573eb0a33a12
2407
2020
msgid "The process for Stable Release Updates is just the same as the proccess for security bugs except you should subscribe ``ubuntu-sru`` to the bug."
2408
2021
msgstr ""
2409
2022
2410
2023
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:133
2411
2024
# 81a7322879ab43249b9d1cd8a24b8616
2412
2025
msgid "The update will go into the ``proposed`` archive (for example ``lucid-proposed``) where it will need to be checked that it fixes the problem and does not introduce new problems.  After a week without reported problems it can be moved to ``updates``."
2413
2026
msgstr ""
2414
2027
2415
2028
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:138
2416
2029
# f654430d35904327bb2a7b6ce0a9d903
2417
2030
msgid "See the `Stable Release Updates wiki page`_ for more information."
2418
2031
msgstr ""
2419
2032
2420
2033
#: ../ubuntu-packaging-guide/traditional-packaging.rst:3
2421
2034
# 01e146ed20574b0491518a5fa96a7814
2422
2035
msgid "Traditional Packaging"
2423
2036
msgstr ""
2424
2037
2425
2038
#: ../ubuntu-packaging-guide/traditional-packaging.rst:5
2426
2039
# bfc81f2a439f41328fa57d85524df487
2427
2040
msgid "FIXME describe traditional packaging here"
2428
2041
msgstr ""
2429
2042
2430
2043
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:3
2431
2044
# de45b250ee434651b8ba2943337e2d9e
2432
2045
msgid "Getting the Source"
2433
2046
msgstr ""
2434
2047
2435
2048
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:6
2436
2049
# 708a4d932f37463e9fe6c0a5064dada9
2437
2050
msgid "Source package URLs"
2438
2051
msgstr ""
2439
2052
2440
2053
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:8
2441
2054
# 1377317bd9494ced9d4a0891bee7a957
2442
2055
msgid "Bazaar provides some very nice shortcuts for accessing Launchpad's source branches of packages in both Ubuntu and Debian."
2443
2056
msgstr ""
2444
2057
2445
2058
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:11
2446
2059
# 170a9600a8f44caeae10765baaf7c21f
2447
2060
msgid "To refer to source branches use::"
2448
2061
msgstr ""
2449
2062
2450
2063
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:15
2451
2064
# 1d24fcdc74354dd7bff584230dfea113
2452
2065
msgid "where *package* refers to the package name you're interested in.  This URL refers to the package in the current development version of Ubuntu.  To refer to the branch of Tomboy in the development version, you would use::"
2453
2066
msgstr ""
2454
2067
2455
2068
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:21
2456
2069
# 7d357984ada0447ba0431181a58b5075
2457
2070
msgid "To refer to the version of a source package in an older release of Ubuntu, just prefix the package name with the release's code name.  E.g. to refer to Tomboy's source package in Maverick_ use::"
2458
2071
msgstr ""
2459
2072
2460
2073
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:27
2461
2074
# 403064151cb24c388caca162735fa0bb
2462
2075
msgid "Since they are unique, you can also abbreviate the distro-series name::"
2463
2076
msgstr ""
2464
2077
2465
2078
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:31
2466
2079
# 262e6ccf32c64d649061db02ab0e5f12
2467
2080
msgid "You can use a similar scheme to access the source branches in Debian, although there are no shortcuts for the Debian distro-series names.  To access the Tomboy branch in the current development series for Debian use::"
2468
2081
msgstr ""
2469
2082
2470
2083
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:37
2471
2084
# 0ceef9271de640e28199e83e7a349385
2472
2085
msgid "and to access Tomboy in Debian Lenny_ use::"
2473
2086
msgstr ""
2474
2087
2475
2088
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:48
2476
2089
# e728f15a7ae54e96b3c8999fb3940624
2477
2090
msgid "Getting the source"
2478
2091
msgstr ""
2479
2092
2480
2093
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:50
2481
2094
# a67d179daf624f7dbbaf3eedfcbcaf6b
2482
2095
msgid "Every source package in Ubuntu has an associated source branch on Launchpad. These source branches are updated automatically by Launchpad, although the process is not currently foolproof."
2483
2096
msgstr ""
2484
2097
2485
2098
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:54
2486
2099
# 50f77ec3e33946019d79cf8f8e68c980
2487
2100
msgid "There are a couple of things that we do first in order to make the workflow more efficient later.  Once you are used to the process you will learn when it makes sense to skip these steps."
2488
2101
msgstr ""
2489
2102
2490
2103
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:62
2491
2104
# 811a02ac0bb74e139dcc5e7d10dc3de2
2492
2105
msgid "Creating a shared repository"
2493
2106
msgstr ""
2494
2107
2495
2108
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:64
2496
2109
# ea541ef4f3bc44c7808d29301195de53
2497
2110
msgid "You want to work on the Tomboy package in Natty, and you've verified that the source package is named ``tomboy``.  Before actually branching the code for Tomboy, create a shared repository to hold the branches for this package.  The shared repository will make future work much more efficient."
2498
2111
msgstr ""
2499
2112
2500
2113
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:70
2501
2114
# a93654da2b2842c3883bd62ee844cf65
2502
2115
msgid "Do this using the `bzr init-repo` command, passing it the directory name we would like to use::"
2503
2116
msgstr ""
2504
2117
2505
2118
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:75
2506
2119
# 6ac6ea4044af40e69f14be43ecd8e313
2507
2120
msgid "You will see that a `tomboy` directory is created in your current working area.  Change to this new directory for the rest of your work::"
2508
2121
msgstr ""
2509
2122
2510
2123
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:82
2511
2124
# e26beb7d28ab4c29ab4f6f4e4c609347
2512
2125
msgid "Getting the trunk branch"
2513
2126
msgstr ""
2514
2127
2515
2128
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:84
2516
2129
# 9c8b09e39fa544619be271049b65feb3
2517
2130
msgid "We use the `bzr branch` command to create a local branch of the package. We'll name the target directory `tomboy.dev` just to keep things easy to remember::"
2518
2131
msgstr ""
2519
2132
2520
2133
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:90
2521
2134
# 1c098b0aedf040e9896f809d48da7baf
2522
2135
msgid "The tomboy.dev directory represents the version of Tomboy in the development version of Ubuntu, and you can always ``cd`` into this directory and do a `bzr pull` to get any future updates."
2523
2136
msgstr ""
2524
2137
2525
2138
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:97
2526
2139
# 478330b59866411d9ac4d2b636845be3
2527
2140
msgid "Ensuring the version is up to date"
2528
2141
msgstr ""
2529
2142
2530
2143
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:99
2531
2144
# d3d9360875864092acc72d83fec79552
2532
2145
msgid "When you do your ``bzr branch`` you will get a message telling you if the packaging branch is up to date.  For example::"
2533
2146
msgstr ""
2534
2147
2535
2148
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:107
2536
2149
# 46fe13c7e5414876b713f54610679084
2537
2150
msgid "Occasionally the importer fails and packaging branches do not match what is in the archive.  A message saying::"
2538
2151
msgstr ""
2539
2152
2540
2153
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:112
2541
2154
# 61d9a5892a464d35bd5b53cd3475ced0
2542
2155
msgid "means the importer has failed.  You can find out why on http://package-import.ubuntu.com/status/ and `file a bug on the UDD project`_ to get the issue resolved."
2543
2156
msgstr ""
2544
2157
2545
2158
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:118
2546
2159
# e29e16998b494544859ca798910a447a
2547
2160
msgid "Upstream Tar"
2548
2161
msgstr ""
2549
2162
2550
2163
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:120
2551
2164
# 20386da53a3741a4a7b84b07b6f0415b
2552
2165
msgid "You can get the upstream tar by running::"
2553
2166
msgstr ""
2554
2167
2555
2168
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:124
2556
2169
# a8dd0f34885b4a9a87be2aa44d7d1c6a
2557
2170
msgid "This will try a number of methods to get the upstream tar, firstly by recreating it from the ``upstream-x.y`` tag in the bzr archive, then by downloading from the Ubuntu archive, lastly by running ``debian/rules get-orig-source``. The upstream tar will also be recreated when using bzr to build the package::"
2558
2171
msgstr ""
2559
2172
2560
2173
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:132
2561
2174
# f92e4efcc80749d4a2d194c830a44e04
2562
2175
msgid "The `builddeb` plugin has several `configuration options`_."
2563
2176
msgstr ""
2564
2177
2565
2178
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:136
2566
2179
# 1549cda4ab0f4671921760913c600e9d
2567
2180
msgid "Getting a branch for a particular release"
2568
2181
msgstr ""
2569
2182
2570
2183
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:138
2571
2184
# 5e1d5d3463784729b51804337afd0f15
2572
2185
msgid "When you want to do something like a `stable release update`_ (SRU), or you just want to examine the code in an old release, you'll want to grab the branch corresponding to a particular Ubuntu release.  For example, to get the Tomboy package for Maverick do::"
2573
2186
msgstr ""
2574
2187
2575
2188
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:147
2576
2189
# 89b049dc5a4e4ab4a5d79fba7de14a97
2577
2190
msgid "Importing a Debian source package"
2578
2191
msgstr ""
2579
2192
2580
2193
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:149
2581
2194
# 948574e1256b401c845dbde95388ad7a
2582
2195
msgid "If the package you want to work on is available in Debian but not Ubuntu, it's still easy to import the code to a local bzr branch for development.  Let's say you want to import the `newpackage` source package.  We'll start by creating a shared repository as normal, but we also have to create a working tree to which the source package will be imported (remember to cd out of the `tomboy` directory created above)::"
2583
2196
msgstr ""
2584
2197
2585
2198
#: ../ubuntu-packaging-guide/udd-getting-the-source.rst:162
2586
2199
# 68b9d2904b2042c8a2feeca5b2112463
2587
2200
msgid "As you can see, we just need to provide the remote location of the dsc file, and Bazaar will do the rest.  You've now got a Bazaar source branch."
2588
2201
msgstr ""
2589
2202
2590
2203
#: ../ubuntu-packaging-guide/udd-intro.rst:3
2591
2204
# e02e5ddbac284aa99584a94dd0782d6e
2592
2205
msgid "Ubuntu Distributed Development - Introduction"
2593
2206
msgstr ""
2594
2207
2595
2208
#: ../ubuntu-packaging-guide/udd-intro.rst:5
2596
2209
# 7ee4234b07754d448c2002b58fcf0a5a
2597
2210
msgid "This guide focuses on packaging using the *Ubuntu Distributed Development* (UDD) method."
2598
2211
msgstr ""
2599
2212
2600
2213
#: ../ubuntu-packaging-guide/udd-intro.rst:8
2601
2214
# f06705abe97045758ae653af62eab8a6
2602
2215
msgid "*Ubuntu Distributed Development* (UDD) is a new technique for developing Ubuntu packages that uses tools, processes, and workflows similar to generic distributed version control system (DVCS) based software development.  The DVCS used for UDD is Bazaar_."
2603
2216
msgstr ""
2604
2217
2605
2218
#: ../ubuntu-packaging-guide/udd-intro.rst:14
2606
2219
# dc7215466a424301828c9e3bcde1a22f
2607
2220
msgid "Traditional Packaging Limitations"
2608
2221
msgstr ""
2609
2222
2610
2223
#: ../ubuntu-packaging-guide/udd-intro.rst:16
2611
2224
# 371cfc21d714497ab868f5e1854d61ef
2612
2225
msgid "Traditionally Ubuntu packages have been kept in tar archive files.  A traditional source package is made up of the upstream source tar, a \"debian\" tar (or compressed diff file for older packages) containing the packaging and a .dsc meta-data file.  To see a traditional package run::"
2613
2226
msgstr ""
2614
2227
2615
2228
#: ../ubuntu-packaging-guide/udd-intro.rst:23
2616
2229
# 1aadf41ee8ef444083f2dea4ad45ec67
2617
2230
msgid "This will download the upstream source ``kdetoys_4.6.5.orig.tar.bz2``, the packaging ``kdetoys_4.6.5-0ubuntu1.debian.tar.gz`` and the meta-data ``kdetoys_4.6.5-0ubuntu1~ppa1.dsc``.  Assuming you have dpkg-dev installed it will extract these and give you the source package."
2618
2231
msgstr ""
2619
2232
2620
2233
#: ../ubuntu-packaging-guide/udd-intro.rst:28
2621
2234
# cf162dd8ac104619800b05a4e8706935
2622
2235
msgid "Traditional packaging would edit these files and upload.  However this gives limited opportunity to collaborate with other developers, changes have to be passed around as diff files with no central way to track them and two developers can not make changes at the same time.  So most teams have moved to putting their packaging in a revision control system.  This makes it easier for several developers to work on a package together.  However there is no direct connection between the revision control system and the archive packages so the two must be manually kept in sync.  Since each team works in its own revision control system a prospective developer must first work out where that is and how to get the packaging before they can work on the package."
2623
2236
msgstr ""
2624
2237
2625
2238
#: ../ubuntu-packaging-guide/udd-intro.rst:40
2626
2239
# ae01db626fea46f78e6cd18691596898
2627
2240
msgid "Ubuntu Distributed Development"
2628
2241
msgstr ""
2629
2242
2630
2243
#: ../ubuntu-packaging-guide/udd-intro.rst:42
2631
2244
# 974d49485a2849168e9942b0804aa69e
2632
2245
msgid "With Ubuntu Distributed Development all packages in the Ubuntu (and Debian) archive are automatically imported into Bazaar branches on our code hosting site Launchpad.  Changes can be made directly to these branches in incremental steps and by anyone with commit access.  Changes can also be made in forked branched and merged back in with Merge Proposals when they are large enough to need review or if they are by someone without direct commit access."
2633
2246
msgstr ""
2634
2247
2635
2248
#: ../ubuntu-packaging-guide/udd-intro.rst:49
2636
2249
# 2af22c6ccf5947babf7cc5902e40e461
2637
2250
msgid "UDD branches are all in a standard location so doing a checkout is easy::"
2638
2251
msgstr ""
2639
2252
2640
2253
#: ../ubuntu-packaging-guide/udd-intro.rst:53
2641
2254
# cb5e2ec745b64f1693c487a5cf6e4bbd
2642
2255
msgid "The merge history includes two separate branches, one for the upstream source and one which adds the ``debian/`` packaging directory::"
2643
2256
msgstr ""
2644
2257
2645
2258
#: ../ubuntu-packaging-guide/udd-intro.rst:59
2646
2259
# 1054f464b56142dab7d1a8e336bda0a4
2647
2260
msgid "(This command uses *qbzr* for a GUI, run ``log`` instead of ``qlog`` for console output.)"
2648
2261
msgstr ""
2649
2262
2650
2263
#: ../ubuntu-packaging-guide/udd-intro.rst:64
2651
2264
# 1dab11a12fd74a3c9b6b0381b1097201
2652
2265
msgid "This UDD branch of *kdetoys* shows the full packaging for each version uploaded to Ubuntu with grey circles and the upstream source versions with green circles.  Versions are tagged with either the version in Ubuntu such as ``4:4.2.29-0ubuntu1`` or for the upstream branch with the upstream version ``upstream-4.2.96``."
2653
2266
msgstr ""
2654
2267
2655
2268
#: ../ubuntu-packaging-guide/udd-intro.rst:70
2656
2269
# bc572117cad0476eb5548602d8dec778
2657
2270
msgid "Many Ubuntu packages are based on the packages in Debian, UDD also imports the Debian package into our branches.  In the *kdetoys* branch above the Debian versions from *unstable* are from the merge with blue circles while those from *Debian experimental* are from the merge with yellow circles.  Debian released are tagged with their version number e.g. ``4:4.2.2-1``."
2658
2271
msgstr ""
2659
2272
2660
2273
#: ../ubuntu-packaging-guide/udd-intro.rst:76
2661
2274
# dacd0f46f92a406c86b2679ce3bf4e28
2662
2275
msgid "So from a UDD branch you can see the complete history of changes to the package and compare any two versions.  For example, to see the changes between version 4.2.2 in Debian and the 4.2.2 in Ubuntu use::"
2663
2276
msgstr ""
2664
2277
2665
2278
#: ../ubuntu-packaging-guide/udd-intro.rst:82
2666
2279
# d71b4d03fccb4e2680449bdc9fa8669b
2667
2280
msgid "(This command uses *qbzr* for a GUI, run ``diff`` instead of ``qdiff`` for console output.)"
2668
2281
msgstr ""
2669
2282
2670
2283
#: ../ubuntu-packaging-guide/udd-intro.rst:87
2671
2284
# 208d833fb66e44b7b0ac5a51f0e6d6ef
2672
2285
msgid "From this we can clearly see what has changed in Ubuntu compared to Debian, very handy."
2673
2286
msgstr ""
2674
2287
2675
2288
#: ../ubuntu-packaging-guide/udd-intro.rst:91
2676
2289
# ae15adc6961442969d8f05f291313348
2677
2290
msgid "Bazaar"
2678
2291
msgstr ""
2679
2292
2680
2293
#: ../ubuntu-packaging-guide/udd-intro.rst:93
2681
2294
# 25ba427a878d451eb0d6bcf63ee5ce00
2682
2295
msgid "UDD branches use Bazaar, a distributed revision control system intended to be easy to use for those familiar with popular systems such as Subversion while offering the power of Git."
2683
2296
msgstr ""
2684
2297
2685
2298
#: ../ubuntu-packaging-guide/udd-intro.rst:97
2686
2299
# f0cefb6f5b3a485aa4e7f7e1819e7cdf
2687
2300
msgid "To do packaging with UDD you will need to know the basics of how to use Bazaar to manage files.  For an introduction to Bazaar see the `Bazaar Five Minute Tutorial <http://doc.bazaar.canonical.com/bzr.dev/en/mini-tutorial/index.html>`_ and the `Bazaar Users Guide <http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/index.html>`_."
2688
2301
msgstr ""
2689
2302
2690
2303
#: ../ubuntu-packaging-guide/udd-intro.rst:105
2691
2304
# c08d41d2e3c94aebb87744586cee7534
2692
2305
msgid "Limitations of UDD"
2693
2306
msgstr ""
2694
2307
2695
2308
#: ../ubuntu-packaging-guide/udd-intro.rst:107
2696
2309
# adf0a0ae209340c592c8159ca0f14d66
2697
2310
msgid "Ubuntu Distributed Development is a new method for working with Ubuntu packages.  It currently has some notable limitations:"
2698
2311
msgstr ""
2699
2312
2700
2313
#: ../ubuntu-packaging-guide/udd-intro.rst:110
2701
2314
# 74f68a68c767479c89d3d0ee9396c90f
2702
2315
msgid "Doing a full branch with history can take a lot of time and network resources.  You may find it quicker to do a lightweight checkout ``bzr checkout --lightweight ubuntu:kdetoys`` but this will need a network access for any further bzr operations."
2703
2316
msgstr ""
2704
2317
2705
2318
#: ../ubuntu-packaging-guide/udd-intro.rst:115
2706
2319
# 4cbeca18d43241faa9c2c1e3817ffa90
2707
2320
msgid "Working with patches is fiddly.  Patches can be seen as a branched revision control system, so we end up with RCS on top of RCS."
2708
2321
msgstr ""
2709
2322
2710
2323
#: ../ubuntu-packaging-guide/udd-intro.rst:118
2711
2324
# 7b4d6c271a8d45f5bac7e40ebff32612
2712
2325
msgid "There is no way to build directly from branches.  You need to create a source package and upload that."
2713
2326
msgstr ""
2714
2327
2715
2328
#: ../ubuntu-packaging-guide/udd-intro.rst:121
2716
2329
# 270ea10b5b5940219b098bfc706f4d40
2717
2330
msgid "Some packages have not been successfully imported into UDD branches.  Recent versions of Bazaar will automatically notify you when this is the case. You can also check the `status of the package importer`_ manually before working on a branch."
2718
2331
msgstr ""
2719
2332
2720
2333
#: ../ubuntu-packaging-guide/udd-intro.rst:126
2721
2334
# 3bb30727b0e849be88b4583d071b56d3
2722
2335
msgid "All of the above are being worked on and UDD is expected to become the main way to work on Ubuntu packages soon.  However currently most teams within Ubuntu do not yet work with UDD branches for their  development.  However because UDD branches are the same as the packages in the  archive any team should be able to accept merges against them."
2723
2336
msgstr ""
2724
2337
2725
2338
#: ../ubuntu-packaging-guide/udd-latest.rst:3
2726
2339
# 9d1a300c3d9345369085e904b67313c1
2727
2340
msgid "Getting The Latest"
2728
2341
msgstr ""
2729
2342
2730
2343
#: ../ubuntu-packaging-guide/udd-latest.rst:5
2731
2344
# 339c0245957f4160b0005b947a3e0d49
2732
2345
msgid "If someone else has landed changes on a package, you will want to pull those changes in your own copies of the package branches."
2733
2346
msgstr ""
2734
2347
2735
2348
#: ../ubuntu-packaging-guide/udd-latest.rst:10
2736
2349
# c18361aeed4245cab2688e479f43a4eb
2737
2350
msgid "Updating your main branch"
2738
2351
msgstr ""
2739
2352
2740
2353
#: ../ubuntu-packaging-guide/udd-latest.rst:12
2741
2354
# a3d5cd0913d04caabf195aeb2cda64c4
2742
2355
msgid "Updating your copy of a branch that corresponds to the package in a particular release is very simple, simply use `bzr pull` from the appropriate directory::"
2743
2356
msgstr ""
2744
2357
2745
2358
#: ../ubuntu-packaging-guide/udd-latest.rst:18
2746
2359
# 575912a50bdb4bc2ab0148d8acfb7535
2747
2360
msgid "This works wherever you have a checkout of a branch, so it will work for things like branches of `maverick`, `hardy-proposed`, etc."
2748
2361
msgstr ""
2749
2362
2750
2363
#: ../ubuntu-packaging-guide/udd-latest.rst:23
2751
2364
# 715c9c2a3372432babab101922e160f8
2752
2365
msgid "Getting the latest in to your working branches"
2753
2366
msgstr ""
2754
2367
2755
2368
#: ../ubuntu-packaging-guide/udd-latest.rst:25
2756
2369
# e4fcfc4c42594affae741d5a17617daf
2757
2370
msgid "Once you have updated your copy of a distroseries branch, then you may want to merge this in to your working branches as well, so that they are based on the latest code."
2758
2371
msgstr ""
2759
2372
2760
2373
#: ../ubuntu-packaging-guide/udd-latest.rst:29
2761
2374
# 55c9366ed7bb49f7b149db6445b466bc
2762
2375
msgid "You don't have to do this all the time though.  You can work on slightly older code with no problems.  The disadvantage would come if you were working on some code that someone else changed.  If you are not working on the latest version then your changes may not be correct, and may even produce conflicts."
2763
2376
msgstr ""
2764
2377
2765
2378
#: ../ubuntu-packaging-guide/udd-latest.rst:34
2766
2379
# 69a77acb1eb54553bc5dcd9c3d08a871
2767
2380
msgid "The merge does have to be done at some point though.  The longer it is left, the harder may be, so doing it regularly should keep each merge simple.  Even if there are many merges the total effort would hopefully be less."
2768
2381
msgstr ""
2769
2382
2770
2383
#: ../ubuntu-packaging-guide/udd-latest.rst:38
2771
2384
# eef9b9378c9b45838c22b8f4773953c5
2772
2385
msgid "To merge the changes you just need to use ``bzr merge``, but you must have committed your current work first::"
2773
2386
msgstr ""
2774
2387
2775
2388
#: ../ubuntu-packaging-guide/udd-latest.rst:44
2776
2389
# 3edc5b6354f848f4b32613cde5118ac9
2777
2390
msgid "Any conflicts will be reported, and you can fix them up.  To review the changes that you just merged use ``bzr diff``.  To undo the merge use ``bzr revert``.  Once you are happy with the changes then use ``bzr commit``."
2778
2391
msgstr ""
2779
2392
2780
2393
#: ../ubuntu-packaging-guide/udd-latest.rst:50
2781
2394
# 21afeaadd6df4d46ba383135caa1d5a5
2782
2395
msgid "Referring to versions of a package"
2783
2396
msgstr ""
2784
2397
2785
2398
#: ../ubuntu-packaging-guide/udd-latest.rst:52
2786
2399
# f680cb9690844d4e8d5cf6456ebb4348
2787
2400
msgid "You will often think in terms of versions of a package, rather than the underlying Bazaar revision numbers.  `bzr-builddeb` provides a revision specifier that makes this convenient.  Any command that takes a ``-r`` argument to specify a revision or revision range will work with this specifier, e.g. ``bzr log``, ``bzr diff``, and so on.  To view the versions of a package, use the ``package:`` specifier::"
2788
2401
msgstr ""
2789
2402
2790
2403
#: ../ubuntu-packaging-guide/udd-latest.rst:61
2791
2404
# c52b8e18c3ac403c97a547b08b53b4d6
2792
2405
msgid "This shows you the difference between package version 0.1-1 and 0.1-2."
2793
2406
msgstr ""
2794
2407
2795
2408
#: ../ubuntu-packaging-guide/udd-merging.rst:3
2796
2409
# dc68e05842b14b3abc7d029142195608
2797
2410
msgid "Merging - Updating from Debian and Upstream"
2798
2411
msgstr ""
2799
2412
2800
2413
#: ../ubuntu-packaging-guide/udd-merging.rst:5
2801
2414
# 3f98d76a08334a3ba6086f2cc533d3e4
2802
2415
msgid "Merging is one of the strengths of Bazaar, and something we do often in Ubuntu development.  Updates can be merged from Debian, from a new upstream release, and from other Ubuntu developers.  Doing it in Bazaar is pretty simple, and all based around the ``bzr merge`` command [#]_."
2803
2416
msgstr ""
2804
2417
2805
2418
#: ../ubuntu-packaging-guide/udd-merging.rst:10
2806
2419
# a21a2c24adf84561899031d40cee0f7e
2807
2420
msgid "While you are in any branch's working directory, you can merge in a branch from a different location.  First check that you have no uncommitted changes::"
2808
2421
msgstr ""
2809
2422
2810
2423
#: ../ubuntu-packaging-guide/udd-merging.rst:15
2811
2424
# 0e0a11b7d1434c9ab7fc02be50311ba1
2812
2425
msgid "If that reports anything then you will either have to commit the changes, revert them, or shelve them to come back to later."
2813
2426
msgstr ""
2814
2427
2815
2428
#: ../ubuntu-packaging-guide/udd-merging.rst:20
2816
2429
# 30562ac2599a48a09b26b05d6de6baa6
2817
2430
msgid "Merging from Debian"
2818
2431
msgstr ""
2819
2432
2820
2433
#: ../ubuntu-packaging-guide/udd-merging.rst:22
2821
2434
# 4afeb333b11b413d8b0aaaa4bf51ed3f
2822
2435
msgid "Next run ``bzr merge`` passing the URL of the branch to merge from.  For example, to merge from the version of the package in Debian Squeeze_ run::"
2823
2436
msgstr ""
2824
2437
2825
2438
#: ../ubuntu-packaging-guide/udd-merging.rst:27
2826
2439
# bb6d2b7b4af740fd8421f9de5170ff16
2827
2440
msgid "This will merge the changes since the last merge point and leave you with changes to review.  This may cause some conflicts.  You can see everything that the ``merge`` command did by running::"
2828
2441
msgstr ""
2829
2442
2830
2443
#: ../ubuntu-packaging-guide/udd-merging.rst:34
2831
2444
# 6ee5bb94d7304d97b2dfcec95e70dcd9
2832
2445
msgid "If conflicts are reported then you need to edit those files to make them look how they should, removing the *conflict markers*.  Once you have done this, run::"
2833
2446
msgstr ""
2834
2447
2835
2448
#: ../ubuntu-packaging-guide/udd-merging.rst:41
2836
2449
# 8facda931138401d9d746d6cbfdf8cff
2837
2450
msgid "This will resolve any conflicted files that you fixed, and then tell you what else you have to deal with."
2838
2451
msgstr ""
2839
2452
2840
2453
#: ../ubuntu-packaging-guide/udd-merging.rst:44
2841
2454
# 37232a75c2d64e788788e8d3c9cbdcfd
2842
2455
msgid "Once any conflicts are resolved, and you have made any other changes that you need, you will add a new changelog entry, and commit::"
2843
2456
msgstr ""
2844
2457
2845
2458
#: ../ubuntu-packaging-guide/udd-merging.rst:50
2846
2459
# 4d14975e51ae4c27ac3ae6b461b69c8d
2847
2460
msgid "as described earlier."
2848
2461
msgstr ""
2849
2462
2850
2463
#: ../ubuntu-packaging-guide/udd-merging.rst:52
2851
2464
# f1f7aa3a73ba40f29456f5de9273d269
2852
2465
msgid "However, before you commit, it is always a good thing to check all the Ubuntu changes by running::"
2853
2466
msgstr ""
2854
2467
2855
2468
#: ../ubuntu-packaging-guide/udd-merging.rst:57
2856
2469
# 9092dbac4b564f63885a506f41582d51
2857
2470
msgid "which will show the differences between the Debian (0.6.10-5) and Ubuntu versions (0.6.10-5ubuntu1).  In similar way you can compare to any other versions.  To see all available versions run::"
2858
2471
msgstr ""
2859
2472
2860
2473
#: ../ubuntu-packaging-guide/udd-merging.rst:63
2861
2474
# d79b9b8fe0324043845b29278e565bce
2862
2475
msgid "After testing and committing the merge, you will need to seek sponsorship or upload to the archive in the normal way."
2863
2476
msgstr ""
2864
2477
2865
2478
#: ../ubuntu-packaging-guide/udd-merging.rst:66
2866
2479
# 19eca11f7f7a4c49a9dffa97507b559e
2867
2480
msgid "If you are going to build the source package from this merged branch, you would use the ``-S`` option to the ``bd`` command.  One other thing you'll want to consider is also using the ``--package-merge`` option.  This will add the appropriate ``-v`` and ``-sa`` options to the source package so that all the changelog entries since the last Ubuntu change will be included in your ``_source.changes`` file.  For example::"
2868
2481
msgstr ""
2869
2482
2870
2483
#: ../ubuntu-packaging-guide/udd-merging.rst:77
2871
2484
# e3d88b2d11f54e8f848d128cdcfbc928
2872
2485
msgid "Merging a new upstream version"
2873
2486
msgstr ""
2874
2487
2875
2488
#: ../ubuntu-packaging-guide/udd-merging.rst:79
2876
2489
# 099bfde19f2041ef82ac880fb89a7656
2877
2490
msgid "When upstream releases a new version (or you want to package a snapshot), you have to merge a tarball into your branch."
2878
2491
msgstr ""
2879
2492
2880
2493
#: ../ubuntu-packaging-guide/udd-merging.rst:82
2881
2494
# ca21132b09dd42f6bae10b7be5d30595
2882
2495
msgid "This is done using the ``bzr merge-upstream`` command.  If your package has a valid ``debian/watch`` file, from inside the branch that you want to merge to, just type this::"
2883
2496
msgstr ""
2884
2497
2885
2498
#: ../ubuntu-packaging-guide/udd-merging.rst:88
2886
2499
# 56b3c9414eb44d2991f7b0d92d00f373
2887
2500
msgid "This will download the tarball and merge it into your branch, automatically adding a ``debian/changelog`` entry for you.  ``bzr-builddeb`` looks at the ``debian/watch`` file for the upstream tarball location."
2888
2501
msgstr ""
2889
2502
2890
2503
#: ../ubuntu-packaging-guide/udd-merging.rst:92
2891
2504
# 5b6202491b164f509bdb9b99311fcf3d
2892
2505
msgid "If you do *not* have a ``debian/watch`` file, you'll need to specify the location of the upstream tarball, and the version manually::"
2893
2506
msgstr ""
2894
2507
2895
2508
#: ../ubuntu-packaging-guide/udd-merging.rst:97
2896
2509
# 53db9d767eca4e80ba838d2b78832063
2897
2510
msgid "The ``--version`` option is used to specify the upstream version that is being merged in, as the command isn't able to infer that (yet)."
2898
2511
msgstr ""
2899
2512
2900
2513
#: ../ubuntu-packaging-guide/udd-merging.rst:100
2901
2514
# deda3c9c46464074b40bfa7a04c15155
2902
2515
msgid "The last parameter is the location of the tarball that you are upgrading to; this can either be a local filesystem path, or a http, ftp, sftp, etc. URI as shown.  The command will automatically download the tarball for you.  The tarball will be renamed appropriately and, if required, converted to ``.gz``."
2903
2516
msgstr ""
2904
2517
2905
2518
#: ../ubuntu-packaging-guide/udd-merging.rst:105
2906
2519
# a8a8873c3b9745318bdaf72cd43d01e6
2907
2520
msgid "The `merge-upstream` command will either tell you that it completed successfully, or that there were conflicts.  Either way you will be able to review the changes before committing as normal."
2908
2521
msgstr ""
2909
2522
2910
2523
#: ../ubuntu-packaging-guide/udd-merging.rst:109
2911
2524
# 90b4d273a547482c9c5ecd37bdcc836d
2912
2525
msgid "If you are merging an upstream release into an existing Bazaar branch that has not previously used the UDD layout, ``bzr merge-upstream`` will fail with an error that the tag for the previous upstream version is not available; the merge can't be completed without knowing what base version to merge against. To work around this, create a tag in your existing repository for the last upstream version present there; e.g., if the last Ubuntu release was *1.1-0ubuntu3*, create the tag *upstream-1.1* pointing to the bzr revision you want to use as the tip of the upstream branch."
2913
2526
msgstr ""
2914
2527
2915
2528
#: ../ubuntu-packaging-guide/udd-merging.rst:122
2916
2529
# 010017a3c74341108012280452144e2d
2917
2530
msgid "You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for the ``merge`` command to work.  Use the versions from Ubuntu 12.04 (Precise) or the development versions from the ``bzr`` PPA.  Specifically, you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version 2.8.1 or newer.  For older versions, use the ``bzr merge-package`` command instead."
2918
2531
msgstr ""
2919
2532
2920
2533
#: ../ubuntu-packaging-guide/udd-newpackage.rst:3
2921
2534
# b8687b8342d4484381ab0009d7571faf
2922
2535
msgid "Building a new package"
2923
2536
msgstr ""
2924
2537
2925
2538
#: ../ubuntu-packaging-guide/udd-newpackage.rst:5
2926
2539
# da3d76bf462b4fd28237be3b02d73c47
2927
2540
msgid "Let's say I have an upstream project that is not yet available for Ubuntu.  I want to create a package from this project and make it available as a PPA_ so that other people can more easily use the code.  This also makes a good first step in contributing your package to universe_."
2928
2541
msgstr ""
2929
2542
2930
2543
#: ../ubuntu-packaging-guide/udd-newpackage.rst:12
2931
2544
# 900f00a174714536a096ade529c569ac
2932
2545
msgid "Example package"
2933
2546
msgstr ""
2934
2547
2935
2548
#: ../ubuntu-packaging-guide/udd-newpackage.rst:14
2936
2549
# feeb33594e7442ed8e558be19bc3e7f5
2937
2550
msgid "I started with a Python library called `flufl.enum`_, which is a fairly typical setuptools-based Python package.  Fortunately, it's also maintained in Launchpad using Bazaar, so that makes bootstrapping much easier."
2938
2551
msgstr ""
2939
2552
2940
2553
#: ../ubuntu-packaging-guide/udd-newpackage.rst:18
2941
2554
# f765bafb78864679b1059e3f15db3a0d
2942
2555
msgid "Because we want to package the trunk branch, getting started is pretty simple::"
2943
2556
msgstr ""
2944
2557
2945
2558
#: ../ubuntu-packaging-guide/udd-newpackage.rst:31
2946
2559
# 39a9d3352730400c808925727ac7d6c5
2947
2560
msgid "Bootstrapping"
2948
2561
msgstr ""
2949
2562
2950
2563
#: ../ubuntu-packaging-guide/udd-newpackage.rst:33
2951
2564
# b1ce6212d91948cfbb6f9bedfa2877c7
2952
2565
msgid "You need to create the initial ``debian`` directory, as well as the necessary files inside the ``debian`` directory.  Currently, there are many ways to set up this directory, but hopefully there will be `some convergence`_ in the methods, especially if you're building standard Python setuptools-based libraries and applications."
2953
2566
msgstr ""
2954
2567
2955
2568
#: ../ubuntu-packaging-guide/udd-newpackage.rst:43
2956
2569
# f87c0194eae54e80964fc3c92f512a2b
2957
2570
msgid "The bzr-builddeb way"
2958
2571
msgstr ""
2959
2572
2960
2573
#: ../ubuntu-packaging-guide/udd-newpackage.rst:45
2961
2574
# 940940706e2c4f2e84b92c940d147915
2962
2575
msgid "You could use the ``dh_make`` command to get things going, or similarly the ``bzr dh-make``.  The latter might provide some benefits, and can be run like so from inside your branch::"
2963
2576
msgstr ""
2964
2577
2965
2578
#: ../ubuntu-packaging-guide/udd-newpackage.rst:52
2966
2579
# b5d07b47aa6a4743b10c5da608ed31e7
2967
2580
msgid "If you don't have a URL to download a tarball from, you'll need to create the tarball locally first.  Use ``bzr dh-make --help`` for details on this command."
2968
2581
msgstr ""
2969
2582
2970
2583
#: ../ubuntu-packaging-guide/udd-newpackage.rst:55
2971
2584
# ad64e2f4ef1d4cd6b7a9cb18b35afe96
2972
2585
msgid "After you've created the ``debian`` directory template, be sure to ``bzr rm`` any ``debian`` files you don't need (e.g. the ``*.ex`` files), and edit files such as ``debian/control``, ``debian/watch``, ``debian/copyright`` and ``debian/changelog``.  The following section may give you some hints about that."
2973
2586
msgstr ""
2974
2587
2975
2588
#: ../ubuntu-packaging-guide/udd-newpackage.rst:63
2976
2589
# 1ba898157b814592a161633f29a60663
2977
2590
msgid "The stdeb way"
2978
2591
msgstr ""
2979
2592
2980
2593
#: ../ubuntu-packaging-guide/udd-newpackage.rst:65
2981
2594
# b1184b49f04442a3a80709e934d63205
2982
2595
msgid "Another way for creating the initial ``debian`` directory for Python setuptools-based packages, is to use the stdeb_ package.  The full documentation for this package is available on the `upstream home`_, but you won't need all of the commands.  stdeb has a command that is *exactly* what we're looking for!"
2983
2596
msgstr ""
2984
2597
2985
2598
#: ../ubuntu-packaging-guide/udd-newpackage.rst:71
2986
2599
# 7565c365c47b4e63b4301d873d7269ae
2987
2600
msgid "In either case, start by putting this in your ``~/.pydistutils.cfg`` file::"
2988
2601
msgstr ""
2989
2602
2990
2603
#: ../ubuntu-packaging-guide/udd-newpackage.rst:78
2991
2604
# 13b8f0432f434c3cad4a07f63df7bc5d
2992
2605
msgid "Modern stdeb"
2993
2606
msgstr ""
2994
2607
2995
2608
#: ../ubuntu-packaging-guide/udd-newpackage.rst:80
2996
2609
# 4a75fbc5a4774bd4a0a03ba0e13f0c62
2997
2610
msgid "Here's how easy it is::"
2998
2611
msgstr ""
2999
2612
3000
2613
#: ../ubuntu-packaging-guide/udd-newpackage.rst:86
3001
2614
# fa8392053d014f42b7e82ec702b7466f
3002
2615
msgid "We also need a ``debian/copyright`` file.  Normally, we'd use ``dh_make -c`` for that but again, that doesn't play nicely with UDD.  ``dh_make`` expects a particular file system layout that we don't have.  No matter, we'll add the copyright file manually::"
3003
2616
msgstr ""
3004
2617
3005
2618
#: ../ubuntu-packaging-guide/udd-newpackage.rst:98
3006
2619
# 83c9385cd7e44dbcbad56c6dc64b116d
3007
2620
msgid "stdeb <= 0.5.1"
3008
2621
msgstr ""
3009
2622
3010
2623
#: ../ubuntu-packaging-guide/udd-newpackage.rst:100
3011
2624
# adb471ff8471413ba7f3702a77ff1c4a
3012
2625
msgid "If you have an older version of stdeb, use this command to create the basic ``debian/`` directory layout::"
3013
2626
msgstr ""
3014
2627
3015
2628
#: ../ubuntu-packaging-guide/udd-newpackage.rst:105
3016
2629
# 442e744568aa4afdba53c9ac58e992ec
3017
2630
msgid "This command leaves you with a ``deb_dist`` directory containing a ``flufl.enum_3.0.1`` directory.  Inside that is your ``debian/`` directory. Because we're using UDD we don't care about anything else that ``sdist_dsc`` produces, so we can shuffle things around and remove the cruft."
3018
2631
msgstr ""
3019
2632
3020
2633
#: ../ubuntu-packaging-guide/udd-newpackage.rst:110
3021
2634
# a9095a611011467283d8b1e16ad71cde
3022
2635
msgid "$ mv deb_dist/munepy-2.0.1/debian . $ rm -rf deb_dist $ bzr add debian $ bzr commit -m'Add debian directory'"
3023
2636
msgstr ""
3024
2637
3025
2638
#: ../ubuntu-packaging-guide/udd-newpackage.rst:117
3026
2639
# d84805c6b2ff43d1815ed48cd6561ca1
3027
2640
msgid "pkgme"
3028
2641
msgstr ""
3029
2642
3030
2643
#: ../ubuntu-packaging-guide/udd-newpackage.rst:119
3031
2644
# e397d168c1464148a5e29252e0c05116
3032
2645
msgid "pkgme_ is a new tool that makes it easy to Debianize a new package.  TBD: describe how to use it."
3033
2646
msgstr ""
3034
2647
3035
2648
#: ../ubuntu-packaging-guide/udd-newpackage.rst:124
3036
2649
# 355c0182eaad4d768364d1dc84933f38
3037
2650
msgid "debian/control file"
3038
2651
msgstr ""
3039
2652
3040
2653
#: ../ubuntu-packaging-guide/udd-newpackage.rst:126
3041
2654
# 09b6bf2c91584bec9c9eb829f34241bd
3042
2655
msgid "You probably want to edit the ``debian/control`` file at this point, adding any information that's missing, or fixing incorrect default information.  For example, I needed to modify the ``Maintainer`` and ``Description`` fields, and add ``X-Python-Version`` and ``Homepage`` fields."
3043
2656
msgstr ""
3044
2657
3045
2658
#: ../ubuntu-packaging-guide/udd-newpackage.rst:131
3046
2659
# 631a463946764d31afd3cdeee7d37d37
3047
2660
msgid "Now we want to build the source package.  The easiest way to do that is with the ``bzr-builddeb`` plugin, however this requires a valid ``debian/watch`` file so that builddeb can find the upstream tarball.  This really should match the version of the checkout you've made."
3048
2661
msgstr ""
3049
2662
3050
2663
#: ../ubuntu-packaging-guide/udd-newpackage.rst:138
3051
2664
# 9fe80612b0f241069d9c6c1eeadce841
3052
2665
msgid "debian/watch file"
3053
2666
msgstr ""
3054
2667
3055
2668
#: ../ubuntu-packaging-guide/udd-newpackage.rst:140
3056
2669
# a718657059c940a6a3c66efda75eb96d
3057
2670
msgid "Here for example is the ``debian/watch`` file I'm using::"
3058
2671
msgstr ""
3059
2672
3060
2673
#: ../ubuntu-packaging-guide/udd-newpackage.rst:145
3061
2674
# d553ecdd289b46feb5bb770b10486af5
3062
2675
msgid "If your tarballs live on Launchpad, the ``debian/watch`` file is a little more complicated (see `Question 21146`_ and `Bug 231797`_ for why this is).  In that case, use something like::"
3063
2676
msgstr ""
3064
2677
3065
2678
#: ../ubuntu-packaging-guide/udd-newpackage.rst:152
3066
2679
# 418bf4f02fac439d998f992dbe976a8a
3067
2680
msgid "So, then it's a matter of...::"
3068
2681
msgstr ""
3069
2682
3070
2683
#: ../ubuntu-packaging-guide/udd-newpackage.rst:159
3071
2684
# c12649f825014fe483b750d0c8964490
3072
2685
msgid "Building the source package"
3073
2686
msgstr ""
3074
2687
3075
2688
#: ../ubuntu-packaging-guide/udd-newpackage.rst:161
3076
2689
# a94c3b29dc50469598d0f49d695c5165
3077
2690
msgid "Now we can build the source package and publish the package as we normally would, with ``bzr builddeb -S`` and ``dput``."
3078
2691
msgstr ""
3079
2692
3080
2693
#: ../ubuntu-packaging-guide/udd-patchsys.rst:3
3081
2694
# f6fb6d9a352d4554abbeb9b2e3acefd9
3082
2695
msgid "Working with Patches"
3083
2696
msgstr ""
3084
2697
3085
2698
#: ../ubuntu-packaging-guide/udd-patchsys.rst:5
3086
2699
# 0363d3d4f8bf4c7b8e08d01edaf97bad
3087
2700
msgid "Many existing packages that have changes from upstream express those changes using a patch system, of which there are several to choose from.  Usually, when you make an additional change to a package, you'll want to add a patch file to the patch system being used, rather than editing the source code in place.  Note however that it is considered bad practice to add a patch system to a package that does not already have one.  In that case, either coordinate with the Debian maintainer, or edit the files in place.  You can find out if your package has a patch system by using the ``what-patch`` command (from the ``ubuntu-dev-tools`` package)."
3088
2701
msgstr ""
3089
2702
3090
2703
#: ../ubuntu-packaging-guide/udd-patchsys.rst:15
3091
2704
# fd42ca6b29c546b1b484b212fd15fd1c
3092
2705
msgid "While Debian has several patch systems, Quilt_ is becoming the most popular. Quilt acts something like a version control system itself, and in the context of UDD, this can be both a good thing and a bad thing.  With Bazaar 2.5 and ``bzr-builddeb`` 2.8.1 (in Ubuntu 12.04 Precise), handling source packages with quilt patches has become much easier."
3093
2706
msgstr ""
3094
2707
3095
2708
#: ../ubuntu-packaging-guide/udd-patchsys.rst:21
3096
2709
# 1434e52e8905421fb549733f8ccba755
3097
2710
msgid "There are two main tasks where you'll have to be aware of quilt patches, when developing your own patch to the upstream code, and when merging new versions of the package from Debian where either the Debian or Ubuntu (or both) have quilt patches in the source branch."
3098
2711
msgstr ""
3099
2712
3100
2713
#: ../ubuntu-packaging-guide/udd-patchsys.rst:26
3101
2714
# b58a5bc7584f477d92f82add21cbecd0
3102
2715
msgid "Here are some guidelines for working with quilt patches in UDD in these two scenarios.  Some of these techniques are works-in-progress, so you should adapt them to your own workflow, and keep watching for improvements from the Bazaar teams."
3103
2716
msgstr ""
3104
2717
3105
2718
#: ../ubuntu-packaging-guide/udd-patchsys.rst:33
3106
2719
# 4fd2951efe3b48d9aa92e5c97a5046a5
3107
2720
msgid "Patches are applied in source branches"
3108
2721
msgstr ""
3109
2722
3110
2723
#: ../ubuntu-packaging-guide/udd-patchsys.rst:35
3111
2724
# 689b0681cd864bc6a2202b83b3ad3bc6
3112
2725
msgid "One important thing to keep in mind: all source branches reflect the tree after a ``quilt push -a``.  In other words, when you branch a source branch from Launchpad, you get the tree with all patches applied, ready for you to jump right into hacking.  You do not need to ``quilt push -a`` manually, and in fact, you'll get a tree with lots of distracting modifications if you push or pop all the changes.  Or to put it another way, once you have a branch, jump right in!"
3113
2726
msgstr ""
3114
2727
3115
2728
#: ../ubuntu-packaging-guide/udd-patchsys.rst:45
3116
2729
# edbb545a25ad4c11971b170125037114
3117
2730
msgid "Merging from Debian with quilt patches"
3118
2731
msgstr ""
3119
2732
3120
2733
#: ../ubuntu-packaging-guide/udd-patchsys.rst:47
3121
2734
# e9715e7c665747098f284eecfde3024d
3122
2735
msgid "With newer versions of Bazaar as mentioned above, merging new Debian versions to Ubuntu versions should be quite easy now, even when one or both packages have quilt patches.  Just use ``bzr merge`` as you normally would.  Under the hood, Bazaar will first unapply all the patches, then do the merge, then if there are no conflicts, it will re-apply the patches leaving you again with a source branch in the ``quilt push -a`` state."
3123
2736
msgstr ""
3124
2737
3125
2738
#: ../ubuntu-packaging-guide/udd-patchsys.rst:54
3126
2739
# eaa05e8c71a745ae850e574631031a92
3127
2740
msgid "For example, if we want to merge the Debian version of the ``aptitude`` package with the Ubuntu version, we would do something like this::"
3128
2741
msgstr ""
3129
2742
3130
2743
#: ../ubuntu-packaging-guide/udd-patchsys.rst:64
3131
2744
# 916812819c4341148647ea8c57bb0b2b
3132
2745
msgid "If there are merge conflicts, the quilt patches will remain unapplied so that you can resolve the conflicts more easily.  You would use a combination of bzr and quilt commands to resolve the conflicts, until all the quilt patches are applied again.  Then you're ready to commit, push, and build as you normally would."
3133
2746
msgstr ""
3134
2747
3135
2748
#: ../ubuntu-packaging-guide/udd-patchsys.rst:72
3136
2749
# f2b77350a5764ee4a465dc7f4e5861e5
3137
2750
msgid "Develop your patch"
3138
2751
msgstr ""
3139
2752
3140
2753
#: ../ubuntu-packaging-guide/udd-patchsys.rst:74
3141
2754
# 82bb00d948bd47f8866ee7c4f83627ab
3142
2755
msgid "There is a strong preference to fixing packages using a patch system like quilt, rather than modifying the source code directly.  This is because with a patch system, it's easier to communicate those changes to Debian or upstream (where UDD isn't used), and to remove patches when upstream fixes the bug the patch addresses (possibly in a completely different way)."
3143
2756
msgstr ""
3144
2757
3145
2758
#: ../ubuntu-packaging-guide/udd-patchsys.rst:80
3146
2759
# 778a274b4f0a4c4594aa0b6d8f2b8ff7
3147
2760
msgid "Let's say there's a bug in the ``dbus`` package that you want to fix.  You start the way you normally would with any package in UDD::"
3148
2761
msgstr ""
3149
2762
3150
2763
#: ../ubuntu-packaging-guide/udd-patchsys.rst:89
3151
2764
# 725d26b712d54930bd3fece4e1205c82
3152
2765
msgid "Maybe the bug is pretty simple; there's a typo in the ``README`` file.  Just fix the typo in your favorite editor, then do a ``bzr stat`` to prove that the file has been edited::"
3153
2766
msgstr ""
3154
2767
3155
2768
#: ../ubuntu-packaging-guide/udd-patchsys.rst:97
3156
2769
# 2c0cd48d546e4ff880a11dbeb672b4ca
3157
2770
msgid "Now, in order to get this fix into a quilt patch, we need to generate a diff, but we need the resulting patch to have a format that is consumable by quilt. The way to do that is to use the ``--prefix`` (or ``-p``) option to ``bzr diff``::"
3158
2771
msgstr ""
3159
2772
3160
2773
#: ../ubuntu-packaging-guide/udd-patchsys.rst:104
3161
2774
# 6c6e406feab94466a83cd9083f63699c
3162
2775
msgid "What this actually does is to produce a *level 1* diff, which is required by the quilt command we're going to use below.  Normally, ``bzr diff`` produces *level 0* diffs which are more easily read by humans, but this won't work with quilt (despite the implication in the quilt documentation)."
3163
2776
msgstr ""
3164
2777
3165
2778
#: ../ubuntu-packaging-guide/udd-patchsys.rst:109
3166
2779
# e01f1a39c4314baebed9a1b1e2a9c332
3167
2780
msgid "The above command generates the patch and stores it in a file one level up from the working tree.  Note that here we're using the ``a`` and ``b`` directory prefixes for the diff, but the actual names don't really matter."
3168
2781
msgstr ""
3169
2782
3170
2783
#: ../ubuntu-packaging-guide/udd-patchsys.rst:113
3171
2784
# 30363be3957a463eb045cefb1229290e
3172
2785
msgid "Now all you need to do is to import the patch into your quilt patches.  If you named the file above with the same name you want into your quilt stack, then just do this::"
3173
2786
msgstr ""
3174
2787
3175
2788
#: ../ubuntu-packaging-guide/udd-patchsys.rst:120
3176
2789
# 6f611850558d485f954a1b60ce5c5730
3177
2790
msgid "You need the last line to inform Bazaar about the new quilt patch file.  You can see that the quilt patch's name is the same as the file name you generated above.  Of course, you can change this by using the ``-P`` option to ``quilt import``."
3178
2791
msgstr ""
3179
2792
3180
2793
#: ../ubuntu-packaging-guide/udd-patchsys.rst:125
3181
2794
# dc69c1cf032e4b1a8294928554dac138
3182
2795
msgid "One important thing to notice is that if you do the commands ``bzr stat`` and a ``quilt applied`` , you'll see that the ``README`` file is still modified, but the ``bug-12345.patch`` is not yet applied.  If you try to apply the newly imported quilt patch (with ``quilt push``), it will fail because you're applying a patch on top of the already patched file."
3183
2796
msgstr ""
3184
2797
3185
2798
#: ../ubuntu-packaging-guide/udd-patchsys.rst:131
3186
2799
# eeec975299cf457d8eddae1b294020a7
3187
2800
msgid "One way around this is to revert the change to ``README`` before doing the ``quilt push``.  However, if you think you may want to continue to develop the patch, and thus do not want to throw away your in-tree changes, use ``bzr shelve`` to save the change in the working tree to the side, then do ``quilt push``.  Either way, once you've pushed your top quilt patch, you can just edit the tree in place, and do ``quilt refresh`` commands to update the top quilt patch."
3188
2801
msgstr ""
3189
2802
3190
2803
#: ../ubuntu-packaging-guide/udd-patchsys.rst:141
3191
2804
# f31c5d24034845779d0438f7ce916170
3192
2805
msgid "Gotchas"
3193
2806
msgstr ""
3194
2807
3195
2808
#: ../ubuntu-packaging-guide/udd-patchsys.rst:143
3196
2809
# 3917fdae40bc40c5b56b50b902677d15
3197
2810
msgid "One thing to keep in mind is that quilt uses a hidden ``.pc`` directory to record its status.  This directory is under version control in all source branches.  *Watch out* for changes to the ``.pc`` directory that are unrelated (or more accurately, uninteresting) to your patch.  This can happen because the UDD source branch importer `currently includes any existing .pc directory`_ in the imported branch.  This can cause conflicts, or other unwanted or unknown changes because you've essentially got two conflicting version control systems competing for the same thing (i.e. bzr and quilt3). For now, the best recommendation is to revert any changes to the ``.pc`` directory in your branch."
3198
2811
msgstr ""
3199
2812
3200
2813
#: ../ubuntu-packaging-guide/udd-patchsys.rst:156
3201
2814
# d65a7f82fcd94ab68c6c627364d2aab3
3202
2815
msgid "edit-patch"
3203
2816
msgstr ""
3204
2817
3205
2818
#: ../ubuntu-packaging-guide/udd-patchsys.rst:158
3206
2819
# b0d8c677b4a54f5ca77d75fb30b8c294
3207
2820
msgid "``edit-patch`` is a nice little wrapper script that comes as part of the ``ubuntu-dev-tools`` package.  It pretty much hides the nasty details of dealing with the patch system specifically.  For example, while the above works well if your package is using quilt already, you'll have to adjust the workflow, perhaps significantly, to work with `a different patch system`_.  In theory ``edit-patch`` should solve this, but there are currently two blockers."
3208
2821
msgstr ""
3209
2822
3210
2823
#: ../ubuntu-packaging-guide/udd-patchsys.rst:165
3211
2824
# a6b9af6d3af64db99d2b68190dfbdfd3
3212
2825
msgid "By default, ``bzr diff`` produces a ``-p0`` patch, but ``edit-patch`` defers to the underlying patch system's default.  For quilt, this is ``-p1``.  ``quilt import`` takes a ``-p`` argument to specify the prefix level, but this isn't yet exposed in ``edit-patch``.  If you use the ``--prefix`` argument to the ``bzr diff`` command as shown above, you should be okay."
3213
2826
msgstr ""
3214
2827
3215
2828
#: ../ubuntu-packaging-guide/udd-patchsys.rst:171
3216
2829
# ce0e11f073b24f4185191bdbc191518a
3217
2830
msgid "By default, ``edit-patch`` requires a path to an existing patch file, but it's more convenient to pipe the output of ``bzr diff`` to the stdin of ``edit-patch``, as shown above.  The alternative would be to save the diff in a temporary file, and then point ``edit-patch`` to this temporary file."
3218
2831
msgstr ""
3219
2832
3220
2833
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:3
3221
2834
# 7b1fc44173cb4391a096f4007ec9c56e
3222
2835
msgid "Seeking Review and Sponsorship"
3223
2836
msgstr ""
3224
2837
3225
2838
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:5
3226
2839
# d95d3d492bda47d4b503e101616df3ad
3227
2840
msgid "One of the biggest advantages to using the UDD workflow is to improve quality by seeking review of changes by your peers.  This is true whether or not you have upload rights yourself.  Of course, if you don't have upload rights, you will need to seek sponsorship."
3228
2841
msgstr ""
3229
2842
3230
2843
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:10
3231
2844
# 06bab422caf142839275125cbb83b8b2
3232
2845
msgid "Once you are happy with your fix, and have a branch ready to go, the following steps can be used to publish your branch on Launchpad, link it to the bug issue, and create a *merge proposal* for others to review, and sponsors to upload."
3233
2846
msgstr ""
3234
2847
3235
2848
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:19
3236
2849
# 3d62b9b1f8c34d3e9365e8e5c66e01cf
3237
2850
msgid "Pushing to Launchpad"
3238
2851
msgstr ""
3239
2852
3240
2853
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:21
3241
2854
# 1c70e306b96d4e2eb85f83a2a0b50255
3242
2855
msgid "We previously showed you how to :ref:`associate your branch to the bug <link-via-changelog>` using ``dch`` and ``bzr commit``.  However, the branch and bug don't actually get linked until you push the branch to Launchpad."
3243
2856
msgstr ""
3244
2857
3245
2858
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:25
3246
2859
# 5c03b03b3018459a87e8d0255fda8159
3247
2860
msgid "It is not critical to have a link to a bug for every change you make, but if you are fixing reported bugs then linking to them will be useful."
3248
2861
msgstr ""
3249
2862
3250
2863
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:28
3251
2864
# d792e1921e3b43a0939226c7dab56f0a
3252
2865
msgid "The general form of the URL you should push your branch to is::"
3253
2866
msgstr ""
3254
2867
3255
2868
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:32
3256
2869
# 5ff727debaf543b4827ed685006c64f3
3257
2870
msgid "For example, to push your fix for bug 12345 in the Tomboy package for Natty, you'd use::"
3258
2871
msgstr ""
3259
2872
3260
2873
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:37
3261
2874
# 5e4aec261f9c445fbacac4b444ab14d4
3262
2875
msgid "The last component of the path is arbitrary; it's up to you to pick something meaningful."
3263
2876
msgstr ""
3264
2877
3265
2878
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:40
3266
2879
# c7881ddc989f47c08a05fc8bdb33ec63
3267
2880
msgid "However, this usually isn't enough to get Ubuntu developers to review and sponsor your change.  You should next submit a *merge proposal*."
3268
2881
msgstr ""
3269
2882
3270
2883
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:43
3271
2884
# 4acecb6b0590401c9c3c3b34f7d9c6c4
3272
2885
msgid "To do this open the bug page in a browser, e.g.::"
3273
2886
msgstr ""
3274
2887
3275
2888
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:47
3276
2889
# a58c58ac96f24e5b974fa5e1fd604700
3277
2890
msgid "If that fails, then you can use::"
3278
2891
msgstr ""
3279
2892
3280
2893
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:51
3281
2894
# 432738e021a442d4993be0b661247073
3282
2895
msgid "where most of the URL matches what you used for `bzr push`.  On this page, you'll see a link that says *Propose for merging into another branch*.  Type in an explanation of your change in the *Initial Comment* box.  Lastly, click *Propose Merge* to complete the process."
3283
2896
msgstr ""
3284
2897
3285
2898
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:56
3286
2899
# 44bc83875c54474b88a148c193bf2145
3287
2900
msgid "Merge proposals to package source branches will automatically subscribe the `~ubuntu-branches` team, which should be enough to reach an Ubuntu developer who can review and sponsor your package change."
3288
2901
msgstr ""
3289
2902
3290
2903
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:62
3291
2904
# 0fca62fbb96b40f8b6a2f6d71b4e931b
3292
2905
msgid "Generating a debdiff"
3293
2906
msgstr ""
3294
2907
3295
2908
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:64
3296
2909
# 497f074532ea41a0ad2f0f737458c0f6
3297
2910
msgid "As noted above, some sponsors still prefer reviewing a *debdiff* attached to bug reports instead of a merge proposal.  If you're requested to include a debdiff, you can generate one like this (from inside your `bug-12345` branch)::"
3298
2911
msgstr ""
3299
2912
3300
2913
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:71
3301
2914
# 0afe1b0f347d4262b8a653e63db9ea5e
3302
2915
msgid "Another way is to is to open the merge proposal and download the diff."
3303
2916
msgstr ""
3304
2917
3305
2918
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:73
3306
2919
# 05d3f3141ec3469ab72b15c0de583f17
3307
2920
msgid "You should ensure that diff has the changes you expect, no more and no less. Name the diff appropriately, e.g. ``foobar-12345.debdiff`` and attach it to the bug report."
3308
2921
msgstr ""
3309
2922
3310
2923
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:79
3311
2924
# 7dd6fe9d8c3b444f8860975c4a8b4f38
3312
2925
msgid "Dealing with feedback from sponsors"
3313
2926
msgstr ""
3314
2927
3315
2928
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:81
3316
2929
# 9e3b1d91bed845d2a6062e3f570b7409
3317
2930
msgid "If a sponsor reviews your branch and asks you to change something, you can do this fairly easily.  Simply go to the branch that you were working in before, make the changes requested, and then commit::"
3318
2931
msgstr ""
3319
2932
3320
2933
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:87
3321
2934
# ad089e0df80b465eb7f1e40716314363
3322
2935
msgid "Now when you push your branch to Launchpad, Bazaar will remembered where you pushed to, and will update the branch on Launchpad with your latest commits. All you need to do is::"
3323
2936
msgstr ""
3324
2937
3325
2938
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:93
3326
2939
# 77f8fca80f29434fbd5168392851dcc7
3327
2940
msgid "You can then reply to the merge proposal review email explaining what you changed, and asking for re-review, or you can reply on the merge proposal page in Launchpad."
3328
2941
msgstr ""
3329
2942
3330
2943
#: ../ubuntu-packaging-guide/udd-sponsorship.rst:97
3331
2944
# 52c8fccf546c44c282c96dfa76047b7e
3332
2945
msgid "Note that if you are sponsored via a debdiff attached to a bug report you need to manually update by generating a new diff and attaching that to the bug report."
3333
2946
msgstr ""
3334
2947
3335
2948
#: ../ubuntu-packaging-guide/udd-uploading.rst:3
3336
2949
# d617008018d04504ba3c700dbfd8a071
3337
2950
msgid "Uploading a package"
3338
2951
msgstr ""
3339
2952
3340
2953
#: ../ubuntu-packaging-guide/udd-uploading.rst:5
3341
2954
# 342b747163f4456a94be40e1565fab2d
3342
2955
msgid "Once your merge proposal is reviewed and approved, you will want to upload your package, either to the archive (if you have permission) or to your `Personal Package Archive`_ (PPA).  You might also want to do an upload if you are sponsoring someone else's changes."
3343
2956
msgstr ""
3344
2957
3345
2958
#: ../ubuntu-packaging-guide/udd-uploading.rst:12
3346
2959
# b0cbfab07b0d4e37a98ac5b47602ba94
3347
2960
msgid "Uploading a change made by you"
3348
2961
msgstr ""
3349
2962
3350
2963
#: ../ubuntu-packaging-guide/udd-uploading.rst:14
3351
2964
# ac079639095a4f71ae085f9ab67edee7
3352
2965
msgid "When you have a branch with a change that you would like to upload you need to get that change back on to the main source branch, build a source package, and then upload it."
3353
2966
msgstr ""
3354
2967
3355
2968
#: ../ubuntu-packaging-guide/udd-uploading.rst:18
3356
2969
# 4eab51f33be241479a6671845543c543
3357
2970
msgid "First, you need to check that you have the latest version of the package in your checkout of the development package trunk::"
3358
2971
msgstr ""
3359
2972
3360
2973
#: ../ubuntu-packaging-guide/udd-uploading.rst:24
3361
2974
# 1e3dc7dfc78d4b1583d03def5dbc4ada
3362
2975
msgid "This pulls in any changes that may have been committed while you were working on your fix.  From here, you have several options.  If the changes on the trunk are large and you feel should be tested along with your change you can merge them into your bug fix branch and test there.  If not, then you can carry on merging your bug fix branch into the development trunk branch.  As of bzr 2.5 and bzr-builddeb 2.8.1, this works with just the standard ``merge`` command::"
3363
2976
msgstr ""
3364
2977
3365
2978
#: ../ubuntu-packaging-guide/udd-uploading.rst:34
3366
2979
# 5c53b237d933489fb5dff7a6cb8065dd
3367
2980
msgid "For older versions of bzr, you can use the ``merge-package`` command instead::"
3368
2981
msgstr ""
3369
2982
3370
2983
#: ../ubuntu-packaging-guide/udd-uploading.rst:38
3371
2984
# cd5c586ed03f4cfd80f044d00f56de68
3372
2985
msgid "This will merge the two trees, possibly producing conflicts, which you'll need to resolve manually."
3373
2986
msgstr ""
3374
2987
3375
2988
#: ../ubuntu-packaging-guide/udd-uploading.rst:41
3376
2989
# 8b79d8ef643e4180a1f3a44ae9d0a774
3377
2990
msgid "Next you should make sure the ``debian/changelog`` is as you would like, with the correct distribution, version number, etc."
3378
2991
msgstr ""
3379
2992
3380
2993
#: ../ubuntu-packaging-guide/udd-uploading.rst:44
3381
2994
# 144b9deb49ad4e5f8ee0d1b34cd8a44d
3382
2995
msgid "Once that is done you should review the change you are about to commit with ``bzr diff``.  This should show you the same changes as a debdiff would before you upload the source package."
3383
2996
msgstr ""
3384
2997
3385
2998
#: ../ubuntu-packaging-guide/udd-uploading.rst:48
3386
2999
# 21d5018d7bf44760b14279b4eef579f5
3387
3000
msgid "The next step is to build and test the modified source package as you normally would::"
3388
3001
msgstr ""
3389
3002
3390
3003
#: ../ubuntu-packaging-guide/udd-uploading.rst:53
3391
3004
# 52f286ea39024b6f9e2589ae45062601
3392
3005
msgid "When you're finally happy with your branch, make sure you've committed all your changes, then tag the branch with the changelog's version number.  The ``bzr tag`` command will do this for you automatically when given no arguments::"
3393
3006
msgstr ""
3394
3007
3395
3008
#: ../ubuntu-packaging-guide/udd-uploading.rst:60
3396
3009
# 99b97002ffe34973979d24ac1668f787
3397
3010
msgid "This tag will tell the package importer that what is in the Bazaar branch is the same as in the archive."
3398
3011
msgstr ""
3399
3012
3400
3013
#: ../ubuntu-packaging-guide/udd-uploading.rst:63
3401
3014
# ebeb745e0c11434c8dcb15cc023ddeb7
3402
3015
msgid "Now you can push the changes back to Launchpad::"
3403
3016
msgstr ""
3404
3017
3405
3018
#: ../ubuntu-packaging-guide/udd-uploading.rst:67
3406
3019
# 2eb1de1779694bf881e03fd5a67d2af0
3407
3020
msgid "(Change the destination if you are uploading an SRU or similar.)"
3408
3021
msgstr ""
3409
3022
3410
3023
#: ../ubuntu-packaging-guide/udd-uploading.rst:69
3411
3024
# 8ebd6bfad0e34d93890640c2bf1b787c
3412
3025
msgid "You need one last step to get your changes uploaded into Ubuntu or your PPA; you need to ``dput`` the source package to the appropriate location.  For example, if you want to upload your changes to your PPA, you'd do::"
3413
3026
msgstr ""
3414
3027
3415
3028
#: ../ubuntu-packaging-guide/udd-uploading.rst:75
3416
3029
# 5a2f077286fb4c7c8f35d5f181dfe020
3417
3030
msgid "or, if you have permission to upload to the primary archive::"
3418
3031
msgstr ""
3419
3032
3420
3033
#: ../ubuntu-packaging-guide/udd-uploading.rst:79
3421
3034
# 9b550ebec58249fbb0fe679464b92453
3422
3035
msgid "You are now free to delete your feature branch, as it is merged, and can be re-downloaded from Launchpad if needed."
3423
3036
msgstr ""
3424
3037
3425
3038
#: ../ubuntu-packaging-guide/udd-uploading.rst:84
3426
3039
# 7df92bf7f57846d9af9f8f9d356bec2c
3427
3040
msgid "Sponsoring a change"
3428
3041
msgstr ""
3429
3042
3430
3043
#: ../ubuntu-packaging-guide/udd-uploading.rst:86
3431
3044
# f9eb51784cf6440ab1e92567c03feddc
3432
3045
msgid "Sponsoring someone else's change is just like the above procedure, but instead of merging from a branch you created, you merge from the branch in the merge proposal::"
3433
3046
msgstr ""
3434
3047
3435
3048
#: ../ubuntu-packaging-guide/udd-uploading.rst:92
3436
3049
# 0419a82213944aa5b48804bb6534d32d
3437
3050
msgid "If there are lots of merge conflicts you would probably want to ask the contributor to fix them up.  See the next section to learn how to cancel a pending merge."
3438
3051
msgstr ""
3439
3052
3440
3053
#: ../ubuntu-packaging-guide/udd-uploading.rst:96
3441
3054
# 0e05452bf9e74469a5de534b92482d86
3442
3055
msgid "But if the changes look good, commit and then follow the rest of the uploading process::"
3443
3056
msgstr ""
3444
3057
3445
3058
#: ../ubuntu-packaging-guide/udd-uploading.rst:103
3446
3059
# 4397bec4fb934bc89cbcb5935485c0eb
3447
3060
msgid "Canceling an upload"
3448
3061
msgstr ""
3449
3062
3450
3063
#: ../ubuntu-packaging-guide/udd-uploading.rst:105
3451
3064
# ccfa3957ac2b47b48e4604768f4af77b
3452
3065
msgid "At any time before you `dput` the source package you can decide to cancel an upload and revert the changes::"
3453
3066
msgstr ""
3454
3067
3455
3068
#: ../ubuntu-packaging-guide/udd-uploading.rst:110
3456
3069
# 8383aa45362241cbbffaefa37a7ef327
3457
3070
msgid "You can do this if you notice something needs more work, or if you would like to ask the contributor to fix up conflicts when sponsoring something."
3458
3071
msgstr ""
3459
3072
3460
3073
#: ../ubuntu-packaging-guide/udd-uploading.rst:115
3461
3074
# 4b45467e48e041d5999db11c24113b1e
3462
3075
msgid "Sponsoring something and making your own changes"
3463
3076
msgstr ""
3464
3077
3465
3078
#: ../ubuntu-packaging-guide/udd-uploading.rst:117
3466
3079
# fe4a60bef7e44faeaa7348763b2e8abb
3467
3080
msgid "If you are going to sponsor someone's work, but you would like to roll it up with some changes of your own then you can merge their work in to a separate branch first."
3468
3081
msgstr ""
3469
3082
3470
3083
#: ../ubuntu-packaging-guide/udd-uploading.rst:121
3471
3084
# 79453712dc2d473eb3c770c9d46d305b
3472
3085
msgid "If you already have a branch where you are working on the package and you would like to include their changes, then simply run the ``bzr merge`` from that branch, instead of the checkout of the development package.  You can then make the changes and commit, and then carry on with your changes to the package."
3473
3086
msgstr ""
3474
3087
3475
3088
#: ../ubuntu-packaging-guide/udd-uploading.rst:127
3476
3089
# 2ad47a1cf0a040a7a39e87a520e87a30
3477
3090
msgid "If you don't have an existing branch, but you know you would like to make changes based on what the contributor provides then you should start by grabbing their branch::"
3478
3091
msgstr ""
3479
3092
3480
3093
#: ../ubuntu-packaging-guide/udd-uploading.rst:133
3481
3094
# a36da929444f4aa79853824f5fad7825
3482
3095
msgid "then work in this new branch, and then merge it in to the main one and upload as if it was your own work.  The contributor will still be mentioned in the changelog, and Bazaar will correctly attribute the changes they made to them."
3483
3096
msgstr ""
3484
3097
3485
3098
#: ../ubuntu-packaging-guide/udd-working.rst:3
3486
3099
# 668df6a55d7d4262959051aff523f18a
3487
3100
msgid "Working on a Package"
3488
3101
msgstr ""
3489
3102
3490
3103
#: ../ubuntu-packaging-guide/udd-working.rst:5
3491
3104
# 325df7ee56fc4514946bee8d8d9833a3
3492
3105
msgid "Once you have the source package branch in a shared repository, you'll want to create additional branches for the fixes or other work you plan to do.  You'll want to base your branch off the package source branch for the distro release that you plan to upload to.  Usually this is the current development release, but it may be older releases if you're backporting to an SRU for example."
3493
3106
msgstr ""
3494
3107
3495
3108
#: ../ubuntu-packaging-guide/udd-working.rst:13
3496
3109
# 3bbdede17cae472d9f3cb41c285ec0a0
3497
3110
msgid "Branching for a change"
3498
3111
msgstr ""
3499
3112
3500
3113
#: ../ubuntu-packaging-guide/udd-working.rst:15
3501
3114
# 9932a9319bf948698e1efbac7555a3b6
3502
3115
msgid "The first thing to do is to make sure your source package branch is up-to-date.  It will be if you just checked it out, otherwise do this::"
3503
3116
msgstr ""
3504
3117
3505
3118
#: ../ubuntu-packaging-guide/udd-working.rst:21
3506
3119
# 6e748312dd324667b18e6eb5cb0503ec
3507
3120
msgid "Any updates to the package that have uploaded since your checkout will now be pulled in.  You do not want to make changes to this branch.  Instead, create a branch that will contain just the changes you're going to make.  Let's say you want to fix bug 12345 for the Tomboy project.  When you're in the shared repository you previously created for Tomboy, you can create your bug fix branch like this::"
3508
3121
msgstr ""
3509
3122
3510
3123
#: ../ubuntu-packaging-guide/udd-working.rst:31
3511
3124
# fcc7556739024f40b1b51f39aa13ca55
3512
3125
msgid "Now you can do all my work in the `bug-12345` directory.  You make changes there as necessary, committing as you go along.  This is just like doing any kind of software development with Bazaar.  You can make intermediate commits as often as you like, and when your changes are finished, you will use the standard `dch` command (from the `devscripts` package)::"
3513
3126
msgstr ""
3514
3127
3515
3128
#: ../ubuntu-packaging-guide/udd-working.rst:39
3516
3129
# 5faa703321cd4d9cb342e35caaab81ac
3517
3130
msgid "This will drop you in an editor to add an entry to the `debian/changelog` file."
3518
3131
msgstr ""
3519
3132
3520
3133
#: ../ubuntu-packaging-guide/udd-working.rst:44
3521
3134
# 6dc1cbcab4874dc589194be12f2d232e
3522
3135
msgid "When you added your `debian/changelog` entry, you should have included a bug fix tag that indicated which Launchpad bug issue you're fixing.  The format of this textual tag is pretty strict: ``LP: #12345``.  The space between the ``:`` and the ``#`` is required and of course you should use the actual bug number that you're fixing.  Your `debian/changelog` entry might look something like::"
3523
3136
msgstr ""
3524
3137
3525
3138
#: ../ubuntu-packaging-guide/udd-working.rst:57
3526
3139
# da1d850b11fe4bb485d5be846264f366
3527
3140
msgid "Commit with the normal::"
3528
3141
msgstr ""
3529
3142
3530
3143
#: ../ubuntu-packaging-guide/udd-working.rst:61
3531
3144
# 4536113fa1c745dd9e502d526185f8ed
3532
3145
msgid "A hook in bzr-builddeb will use the debian/changelog text as the commit message and set the tag to mark bug #12345 as fixed."
3533
3146
msgstr ""
3534
3147
3535
3148
#: ../ubuntu-packaging-guide/udd-working.rst:64
3536
3149
# 9f3672cba68a4714ad6a5deacb93dc6e
3537
3150
msgid "This only works with bzr-builddeb 2.7.5 and bzr 2.4, for older versions use `debcommit`."
3538
3151
msgstr ""
3539
3152
3540
3153
#: ../ubuntu-packaging-guide/udd-working.rst:71
3541
3154
# 86ee6fff8e524ab1bac18e701df02f1b
3542
3155
msgid "Along the way, you'll want to build your branch so that you can test it to make sure it does actually fix the bug."
3543
3156
msgstr ""
3544
3157
3545
3158
#: ../ubuntu-packaging-guide/udd-working.rst:74
3546
3159
# 98afbf48360941e5b164fa1d32a48659
3547
3160
msgid "In order to build the package you can use the `bzr builddeb` command from the `bzr-builddeb` package.  You can build a source package with::"
3548
3161
msgstr ""
3549
3162
3550
3163
#: ../ubuntu-packaging-guide/udd-working.rst:79
3551
3164
# e6bd918c14214ff4926e67edf70e2ecf
3552
3165
msgid "(`bd` is an alias for `builddeb`.)  You can leave the package unsigned by appending `-- -uc -us` to the command."
3553
3166
msgstr ""
3554
3167
3555
3168
#: ../ubuntu-packaging-guide/udd-working.rst:82
3556
3169
# c4d3a439bc0443f5b843f22078807d77
3557
3170
msgid "It is also possible to use your normal tools, as long as they are able to strip the .bzr directories from the package, e.g.::"
3558
3171
msgstr ""
3559
3172
3560
3173
#: ../ubuntu-packaging-guide/udd-working.rst:87
3561
3174
# eff4ddb86f804ce2a5686727949160e0
3562
3175
msgid "If you ever see an error related to trying to build a native package without a tarball, check to see if there is a `.bzr-builddeb/default.conf` file erroneously specifying the package as native.  If the changelog version has a dash in it, then it's not a native package, so remove the configuration file. Note that while `bzr builddeb` has a `--native` switch, it does not have a `--no-native` switch."
3563
3176
msgstr ""
3564
3177
3565
3178
#: ../ubuntu-packaging-guide/udd-working.rst:94
3566
3179
# d006ba6b5e3946e8a3778fa2ec263b31
3567
3180
msgid "Once you've got the source package, you can build it as normal with ``pbuilder-dist`` (or ``pbuilder`` or `sbuild`_)."
3568
3181
msgstr ""
3569
3182
3570
0
3183
3571
=== added file 'po/ubuntu-packaging-guide.pot'
3572
--- po/ubuntu-packaging-guide.pot	1970-01-01 00:00:00 +0000
3573
+++ po/ubuntu-packaging-guide.pot	2012-03-20 20:48:20 +0000
3574
@@ -0,0 +1,3182 @@
3575
1
# SOME DESCRIPTIVE TITLE.
3576
2
# Copyright (C) 2010-2012, Ubuntu Developers
3577
3
# This file is distributed under the same license as the ubuntu-packaging-guide package.
3578
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
3579
5
#
3580
6
#, fuzzy
3581
7
msgid ""
3582
8
msgstr ""
3583
9
"Project-Id-Version: ubuntu-packaging-guide 0.1\n"
3584
10
"Report-Msgid-Bugs-To: \n"
3585
11
"POT-Creation-Date: 2012-02-29 17:52\n"
3586
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3587
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3588
14
"Language-Team: LANGUAGE <LL@li.org>\n"
3589
15
"MIME-Version: 1.0\n"
3590
16
"Content-Type: text/plain; charset=UTF-8\n"
3591
17
"Content-Transfer-Encoding: 8bit\n"
3592
18
3593
19
#: ../ubuntu-packaging-guide/chroots.rst:3
3594
20
# d6c7ecbd606c4b9282b23708db85f9b5
3595
21
msgid "Using Chroots"
3596
22
msgstr ""
3597
23
3598
24
#: ../ubuntu-packaging-guide/chroots.rst:5
3599
25
# c2a9180a73924eb0b652907be2585c5d
3600
26
msgid "If you are running one version of Ubuntu but working on packages for another versions you can create the environment of the other version with a ``chroot``."
3601
27
msgstr ""
3602
28
3603
29
#: ../ubuntu-packaging-guide/chroots.rst:9
3604
30
# 6634399d63e843f4b72b0f770fafd076
3605
31
msgid "A ``chroot`` allows you to have a full filesystem from another distribution which you can work in quite normally.  It avoids the overhead of running a full virtual machine."
3606
32
msgstr ""
3607
33
3608
34
#: ../ubuntu-packaging-guide/chroots.rst:14
3609
35
# feb922fa269d4d50913b3692dea2800f
3610
36
msgid "Creating a Chroot"
3611
37
msgstr ""
3612
38
3613
39
#: ../ubuntu-packaging-guide/chroots.rst:16
3614
40
# 84f92237b55541a2b463749f2521ca05
3615
41
msgid "Use the command ``debootstrap`` to create a new chroot::"
3616
42
msgstr ""
3617
43
3618
44
#: ../ubuntu-packaging-guide/chroots.rst:20
3619
45
# 9208c7dbf8d84b5eb0fd24fab308ff5c
3620
46
msgid "This will create a directory ``oneiric`` and install a minimal oneiric system into it."
3621
47
msgstr ""
3622
48
3623
49
#: ../ubuntu-packaging-guide/chroots.rst:23
3624
50
# 2f24711099184a0ba8f80c20edc1adc2
3625
51
msgid "If your version of ``debootstrap`` does not know about oneiric you can try upgrading to the version in ``backports``."
3626
52
msgstr ""
3627
53
3628
54
#: ../ubuntu-packaging-guide/chroots.rst:26
3629
55
# 0575a501ac4448359c69b30b55550435
3630
56
msgid "You can then work inside the chroot::"
3631
57
msgstr ""
3632
58
3633
59
#: ../ubuntu-packaging-guide/chroots.rst:30
3634
60
# 6b1f042f6de1476db33347866860441c
3635
61
msgid "Where you can install or remove any package you wish without affecting your main system."
3636
62
msgstr ""
3637
63
3638
64
#: ../ubuntu-packaging-guide/chroots.rst:33
3639
65
# 9536d8f2c01e43648648496a446eeb6e
3640
66
msgid "You might want to copy your GPG/ssh keys and Bazaar configuration into the chroot so you can access and sign packages directly."
3641
67
msgstr ""
3642
68
3643
69
#: ../ubuntu-packaging-guide/chroots.rst:36
3644
70
# e6d516f40fee4cc2972525ec9b13615e
3645
71
msgid "$ sudo mkdir oneiric/home/<username> $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar oneiric/home/<username>"
3646
72
msgstr ""
3647
73
3648
74
#: ../ubuntu-packaging-guide/chroots.rst:39
3649
75
# ed82e18debb24933ad3b49492b196442
3650
76
msgid "To stop apt and other programs complaining about missing locales you can install your relevant language pack::"
3651
77
msgstr ""
3652
78
3653
79
#: ../ubuntu-packaging-guide/chroots.rst:44
3654
80
# 7d9703bd6d9148daa5980a104d8d13ef
3655
81
msgid "If you want to run X programs you will need to bind the /tmp directory into the chroot, from outside the chroot run::"
3656
82
msgstr ""
3657
83
3658
84
#: ../ubuntu-packaging-guide/chroots.rst:50
3659
85
# 3c056ca4d3b54c53bca74c2cc2025835
3660
86
msgid "Some programs may need you to bind /dev or /proc."
3661
87
msgstr ""
3662
88
3663
89
#: ../ubuntu-packaging-guide/chroots.rst:52
3664
90
# 7164d56709d64a9e83edc09bf710fce7
3665
91
msgid "For more information on chroots see our `Debootstrap Chroot wiki page`_."
3666
92
msgstr ""
3667
93
3668
94
#: ../ubuntu-packaging-guide/chroots.rst:55
3669
95
# 26aacfbeebe4473f9e1244c3c974b6ff
3670
96
msgid "Alternatives"
3671
97
msgstr ""
3672
98
3673
99
#: ../ubuntu-packaging-guide/chroots.rst:57
3674
100
# f085504840904fcb995131456d3036d7
3675
101
msgid "SBuild is a system similar to PBuilder for creating an environment to run test package builds in.  It closer matches that used by Launchpad for building packages but takes some more setup compared to PBuilder.  See `the Security Team Build Environment wiki page`_ for a full explanation."
3676
102
msgstr ""
3677
103
3678
104
#: ../ubuntu-packaging-guide/chroots.rst:59
3679
105
# 9fa7e581df034a33a4503a7a41b37017
3680
106
msgid "Full virtual machines can be useful for packaging and testing programmes.  TestDrive is a program to automate syncing and running daily ISO images, see `the TestDrive wiki page`_ for more information."
3681
107
msgstr ""
3682
108
3683
109
#: ../ubuntu-packaging-guide/chroots.rst:63
3684
110
# 112cec755e0d4ac5a0e1e20df59807f8
3685
111
msgid "You can also set up pbuilder to pause when it comes across a build failure.  Copy C10shell from /usr/share/doc/pbuilder/examples into a directory and use the --hookdir= argument to point to it."
3686
112
msgstr ""
3687
113
3688
114
#: ../ubuntu-packaging-guide/chroots.rst:67
3689
115
# 1367b95423434ae9b8d2687c8c100771
3690
116
msgid "Amazon's `EC2 cloud computers`_ allow you to hire a computer paying a few US cents per hour, you can set up Ubuntu machines of any supported version and package on those.  This is useful when you want to compile many packages at the same time or to overcome bandwidth restraints."
3691
117
msgstr ""
3692
118
3693
119
#: ../ubuntu-packaging-guide/communication.rst:3
3694
120
# 607298b09c134c8497b9dd820a18456f
3695
121
msgid "Communication in Ubuntu Development"
3696
122
msgstr ""
3697
123
3698
124
#: ../ubuntu-packaging-guide/communication.rst:5
3699
125
# 02e7427cdd1a4e48b9f0dfa256715944
3700
126
msgid "In a project where thousands of lines of code are changed, lots of decisions are made and hundreds of people interact every day, it is important to communicate effectively."
3701
127
msgstr ""
3702
128
3703
129
#: ../ubuntu-packaging-guide/communication.rst:10
3704
130
# 8dff4e5170734f698bbb51c6807b7dcf
3705
131
msgid "Mailing lists"
3706
132
msgstr ""
3707
133
3708
134
#: ../ubuntu-packaging-guide/communication.rst:12
3709
135
# 7bdd3f8f13b34307a06a05656c94760b
3710
136
msgid "Mailing lists are a very important tool if you want to communicate ideas to a broader team and make sure that you reach everybody, even across timezones."
3711
137
msgstr ""
3712
138
3713
139
#: ../ubuntu-packaging-guide/communication.rst:16
3714
140
# ec54a70a969342e58399443508c91e33
3715
141
msgid "In terms of development, these are the most important ones:"
3716
142
msgstr ""
3717
143
3718
144
#: ../ubuntu-packaging-guide/communication.rst:18
3719
145
# c583284d21a5478e973448d96344c720
3720
146
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-announce (announce-only, the most important development announcements go here)"
3721
147
msgstr ""
3722
148
3723
149
#: ../ubuntu-packaging-guide/communication.rst:20
3724
150
# 187731122f5045a09748d70e00456b4c
3725
151
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel (general Ubuntu development discussion)"
3726
152
msgstr ""
3727
153
3728
154
#: ../ubuntu-packaging-guide/communication.rst:22
3729
155
# 38f45dd72cfd4f64bc0e64af440c45c2
3730
156
msgid "https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu (MOTU Team discussion, get help with packaging)"
3731
157
msgstr ""
3732
158
3733
159
#: ../ubuntu-packaging-guide/communication.rst:27
3734
160
# bcf8bf4cfd7d44e79964fc504e3dcbcf
3735
161
msgid "IRC Channels"
3736
162
msgstr ""
3737
163
3738
164
#: ../ubuntu-packaging-guide/communication.rst:29
3739
165
# 1640a1e73721469dbb00fb44535008f2
3740
166
msgid "For real-time discussions, please connect to irc.freenode.net and join one or any of these channels:"
3741
167
msgstr ""
3742
168
3743
169
#: ../ubuntu-packaging-guide/communication.rst:32
3744
170
# 54b7cb96eed649698da71070bdcec51b
3745
171
msgid "#ubuntu-devel (for general development discussion)"
3746
172
msgstr ""
3747
173
3748
174
#: ../ubuntu-packaging-guide/communication.rst:33
3749
175
# 9d87672ae32043ec8c0a9f2bca0b7dd4
3750
176
msgid "#ubuntu-motu (for MOTU team discussion and generally getting help)"
3751
177
msgstr ""
3752
178
3753
179
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:2
3754
180
# 89800d29a2d548768207920d6fb6d7b3
3755
181
msgid "Basic Overview of the ``debian/`` Directory"
3756
182
msgstr ""
3757
183
3758
184
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:4
3759
185
# 7d1e060c05644770b508535c347508a1
3760
186
msgid "This article will briefly explain the different files important to the packaging of Ubuntu packages which are contained in the ``debian/`` directory. The most important of them are ``changelog``, ``control``, ``copyright``, and ``rules``. These are required for all packages. A number of additional files in the ``debian/`` may be used in order to customize and configure the behavior of the package. Some of these files are discussed in this article, but this is not meant to be a complete list."
3761
187
msgstr ""
3762
188
3763
189
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:13
3764
190
# 3021836f0c23449690b60757ce61172a
3765
191
msgid "The changelog"
3766
192
msgstr ""
3767
193
3768
194
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:15
3769
195
# 31bd62153b0d408bb34738128c941836
3770
196
msgid "This file is, as its name implies, a listing of the changes made in each version. It has a specific format that gives the package name, version, distribution, changes, and who made the changes at a given time. If you have a GPG key (see: :doc:`Getting set up<./getting-set-up/>`), make sure to use the same name and email address in ``changelog`` as you have in your key. The following is a template ``changelog``::"
3771
197
msgstr ""
3772
198
3773
199
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:31
3774
200
# 615d3cedb82c4d399c625d3986b6c75e
3775
201
msgid "The format (especially of the date) is important. The date should be in :rfc:`5322` format, which can be obtained by using the command ``date -R``. For convenience, the command ``dch`` may be used to edit changelog. It will update the date automatically."
3776
202
msgstr ""
3777
203
3778
204
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:36
3779
205
# 3d1b93961c0a46a4b77382e11822dd08
3780
206
msgid "Minor bullet points are indicated by a dash \"-\", while major points use an asterisk \"*\"."
3781
207
msgstr ""
3782
208
3783
209
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:39
3784
210
# 3c8e29b2b199417083f23153de4c94c4
3785
211
msgid "If you are packaging from scratch, ``dch --create`` (``dch`` is in the ``devscripts`` package) will create a standard ``debian/changelog`` for you."
3786
212
msgstr ""
3787
213
3788
214
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:43
3789
215
# 0f6505553bb0491d9f0247c37f87cf9a
3790
216
msgid "Here is a sample ``changelog`` file for hello::"
3791
217
msgstr ""
3792
218
3793
219
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:52
3794
220
# 3f1fd2f3b89a4e36aff77a170ba8c656
3795
221
msgid "Notice that the version has a ``-0ubuntu1`` appended to it, this is the distro revision, used so that the packaging can be updated (to fix bugs for example) with new uploads within the same source release version."
3796
222
msgstr ""
3797
223
3798
224
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:56
3799
225
# 8500e33e8dae496d9bab351d1f1f0a0d
3800
226
msgid "Ubuntu and Debian have slightly different package versioning schemes to avoid conflicting packages with the same source version. If a Debian package has been changed in Ubuntu, it has ``ubuntuX`` (where ``X`` is the Ubuntu revision number) appended to the end of the Debian version. So if the Debian hello ``2.6-1`` package was changed by Ubuntu, the version string would be ``2.6-1ubuntu1``. If a package for the application does not exist in Debian, then the Debian revision is ``0`` (e.g. ``2.6-0ubuntu1``)."
3801
227
msgstr ""
3802
228
3803
229
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:64
3804
230
# 8a1028b5e61244339a21d8fdf991cd73
3805
231
msgid "For further information, see the `changelog section (Section 4.4) <http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog>`_ of the Debian Policy Manual."
3806
232
msgstr ""
3807
233
3808
234
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:70
3809
235
# 552ad1faf3814524bd838abbb1c6dfde
3810
236
msgid "The control file"
3811
237
msgstr ""
3812
238
3813
239
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:72
3814
240
# 0a7a9cd926a5482090b334ae4eb5fa76
3815
241
msgid "The ``control`` file contains the information that the package manager (such as ``apt-get``, ``synaptic``, and ``adept``) uses, build-time dependencies, maintainer information, and much more."
3816
242
msgstr ""
3817
243
3818
244
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:76
3819
245
# 2c2caa9a9fef495dad29ffa07ab52d4a
3820
246
msgid "For the Ubuntu ``hello`` package, the ``control`` file looks something like::"
3821
247
msgstr ""
3822
248
3823
249
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:99
3824
250
# bd3ddeb9c3fd445ba6df546d419ec391
3825
251
msgid "The first paragraph describes the source package including the list of packages required to build the package from source in the ``Build-Depends`` field. It also contains some meta-information such as the maintainer's name, the version of Debian Policy that the package complies with, the location of the packaging version control repository, and the upstream home page."
3826
252
msgstr ""
3827
253
3828
254
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:106
3829
255
# 93b0eec4843d4f819ba16118070fbbdf
3830
256
msgid "Note that in Ubuntu, we set the ``Maintainer`` field to a general address because anyone can change any package (this differs from Debian where changing packages is usually restricted to an individual or a team). Packages in Ubuntu should generally have the ``Maintainer`` field set to ``Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>``. If the Maintainer field is modified, the old value should be saved in the ``XSBC-Original-Maintainer`` field. This can be done automatically with the  ``update-maintainer`` script available in the ``ubuntu-dev-tools`` package. For further information, see the `Debian Maintainer Field spec <https://wiki.ubuntu.com/DebianMaintainerField>`_ on the Ubuntu wiki."
3831
257
msgstr ""
3832
258
3833
259
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:118
3834
260
# 00ca42e43f314557af47bf373ae50fe6
3835
261
msgid "Each additional paragraph describes a binary package to be built."
3836
262
msgstr ""
3837
263
3838
264
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:120
3839
265
# a48f51f0912a4312a904ab5f40ced13d
3840
266
msgid "For further information, see the `control file section (Chapter 5) <http://www.debian.org/doc/debian-policy/ch-controlfields.html>`_ of the Debian Policy Manual."
3841
267
msgstr ""
3842
268
3843
269
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:126
3844
270
# 870ce0ac216c4fd8a10aa642d5a8ee12
3845
271
msgid "The copyright file"
3846
272
msgstr ""
3847
273
3848
274
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:128
3849
275
# a8f880bcb0174968b217b52dfc303a34
3850
276
msgid "This file gives the copyright information for both the upstream source and the packaging. Ubuntu and `Debian Policy (Section 12.5) <http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile>`_ require that each package installs a verbatim copy of its copyright and license information to ``/usr/share/doc/$(package_name)/copyright``."
3851
277
msgstr ""
3852
278
3853
279
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:134
3854
280
# 73c9109a50ce4e2c8d6ce22c64df57dd
3855
281
msgid "Generally, copyright information is found in the ``COPYING`` file in the program's source directory. This file should include such information as the names of the author and the packager, the URL from which the source came, a Copyright line with the year and copyright holder, and the text of the copyright itself. An example template would be::"
3856
282
msgstr ""
3857
283
3858
284
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:176
3859
285
# 7a2e84d5a9304d2fb327fc2d39a75a45
3860
286
msgid "This example follows the `Machine-readable debian/copyright <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>`_ format. You are encouraged to use this format as well."
3861
287
msgstr ""
3862
288
3863
289
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:182
3864
290
# 7c0fe27bc8fa4cb192be460e57dde489
3865
291
msgid "The rules file"
3866
292
msgstr ""
3867
293
3868
294
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:184
3869
295
# 7c9e2edb563c4fe894feeae0b17007c7
3870
296
msgid "The last file we need to look at is ``rules``. This does all the work for creating our package. It is a Makefile with targets to compile and install the application, then create the ``.deb`` file from the installed files. It also has a target to clean up all the build files so you end up with just a source package again."
3871
297
msgstr ""
3872
298
3873
299
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:192
3874
300
# 299ff74602f94f758774713d29895440
3875
301
msgid "Here is a simplified version of the rules file created by ``dh_make`` (which can be found in the ``dh-make`` package)::"
3876
302
msgstr ""
3877
303
3878
304
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:204
3879
305
# 94a7b044a9824b13b733ffe6b5ee57b5
3880
306
msgid "Let us go through this file in some detail. What this does is pass every build target that ``debian/rules`` is called with as an argument to ``/usr/bin/dh``, which itself will call all the necessary ``dh_*`` commands."
3881
307
msgstr ""
3882
308
3883
309
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:208
3884
310
# de59039f8bd245d7971edf916d93a839
3885
311
msgid "``dh`` runs a sequence of debhelper commands. The supported sequences correspond to the targets of a ``debian/rules`` file: \"build\", \"clean\", \"install\", \"binary-arch\", \"binary-indep\", and \"binary\". In order to see what commands are run in each target, run::"
3886
312
msgstr ""
3887
313
3888
314
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:217
3889
315
# 7d39368e13994bedac97c6e43018bbb2
3890
316
msgid "Commands in the binary-indep sequence are passed the \"-i\" option to ensure they only work on binary independent packages, and commands in the binary-arch sequences are passed the \"-a\" option to ensure they only work on architecture dependent packages."
3891
317
msgstr ""
3892
318
3893
319
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:222
3894
320
# 9aeaa267814c4f199174eb45833f25c2
3895
321
msgid "Each debhelper command will record when it's successfully run in ``debian/package.debhelper.log``. (Which dh_clean deletes.) So dh can tell which commands have already been run, for which packages, and skip running those commands again."
3896
322
msgstr ""
3897
323
3898
324
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:227
3899
325
# efa044d38ff14eebb1b18fab6a0d594d
3900
326
msgid "Each time ``dh`` is run, it examines the log, and finds the last logged command that is in the specified sequence. It then continues with the next command in the sequence. The ``--until``, ``--before``, ``--after``, and ``--remaining`` options can override this behavior."
3901
327
msgstr ""
3902
328
3903
329
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:232
3904
330
# d01ecd38632646f4b2bbaf1c8a08477d
3905
331
msgid "If ``debian/rules`` contains a target with a name like ``override_dh_command``, then when it gets to that command in the sequence, ``dh`` will run that target from the rules file, rather than running the actual command. The override target can then run the command with additional options, or run entirely different commands instead. (Note that to use this feature, you should Build-Depend on debhelper 7.0.50 or above.)"
3906
332
msgstr ""
3907
333
3908
334
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:241
3909
335
# 3f4e235a68754876866310c506863f75
3910
336
msgid "Have a look at ``/usr/share/doc/debhelper/examples/`` and ``man dh`` for more examples. Also see `the rules section (Section 4.9) <http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules>`_ of the Debian Policy Manual."
3911
337
msgstr ""
3912
338
3913
339
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:247
3914
340
# 909152843c7c41ffa14664f13cb0e23f
3915
341
msgid "Additional Files"
3916
342
msgstr ""
3917
343
3918
344
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:250
3919
345
# f6ef0e8b2e5149f59850c2425711b97f
3920
346
msgid "The install file"
3921
347
msgstr ""
3922
348
3923
349
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:252
3924
350
# 526e3303d4d44e27a3ceefc4764a54c9
3925
351
msgid "The ``install`` file is used by ``dh_install`` to install files into the binary package. It has two standard use cases:"
3926
352
msgstr ""
3927
353
3928
354
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:255
3929
355
# 8f1de6bb1994494b807ec69b3af9e2ff
3930
356
msgid "To install files into your package that are not handled by the upstream build system."
3931
357
msgstr ""
3932
358
3933
359
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:256
3934
360
# ecb71f5a256c4c0ab18dd78194054e68
3935
361
msgid "Splitting a single large source package into multiple binary packages."
3936
362
msgstr ""
3937
363
3938
364
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:258
3939
365
# b540bec3330242b48b8b6c6f34cfacf6
3940
366
msgid "In the first case, the ``install`` file should have one line per file installed, specifying both the the file and the installation directory. For example, the following ``install`` file would install the script ``foo`` in the source package's root directory to ``usr/bin`` and a desktop file in the ``debian`` directory to ``usr/share/applications``::"
3941
367
msgstr ""
3942
368
3943
369
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:269
3944
370
# cdd19fc100104c8ea9f0588252dfa8cb
3945
371
msgid "When a source package is producing multiple binary packages ``dh`` will install the files into ``debian/tmp`` rather than directly into ``debian/<package>``. Files installed into ``debian/tmp`` can then be moved into separate binary packages using multiple ``$package_name.install`` files. This is often done to split large amounts of architecture independent data out of architecture dependent packages and into ``Architecture: all`` packages. In this case, only the name of the files (or directories) to be installed are needed without the installation directory. For example, ``foo.install`` containing only the architecture dependent files might look like::"
3946
372
msgstr ""
3947
373
3948
374
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:282
3949
375
# 490646dff688435088bd93ff30de6a8a
3950
376
msgid "While ``foo-common.install`` containing only the architecture independent file might look like::"
3951
377
msgstr ""
3952
378
3953
379
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:290
3954
380
# ad5ae2bd9270403fb9916024351646c9
3955
381
msgid "This would create two binary packages, ``foo`` and ``foo-common``. Both would require their own paragraph in ``debian/control``."
3956
382
msgstr ""
3957
383
3958
384
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:293
3959
385
# ed10a77119a6408b8a5f7bfebc53500e
3960
386
msgid "See ``man dh_install`` and the `install file section (Section 5.11) <http://www.debian.org/doc/manuals/maint-guide/dother.en.html#install>`_  of the Debian New Maintainers' Guide for additional details."
3961
387
msgstr ""
3962
388
3963
389
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:298
3964
390
# 2bce7b3f508c457eb566c77de679acd7
3965
391
msgid "The watch file"
3966
392
msgstr ""
3967
393
3968
394
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:300
3969
395
# d22412241e7349bfa19c0ca46d59fa93
3970
396
msgid "The ``debian/watch`` file allows us to check automatically for new upstream versions using the tool ``uscan`` found in the ``devscripts`` package. The first line of the watch file must be the format version (3, at the time of this writing), while the following lines contain any URLs to parse. For example::"
3971
397
msgstr ""
3972
398
3973
399
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:309
3974
400
# 3fd98ffeb19c4a2290a8fec31eed399c
3975
401
msgid "Running ``uscan`` in the root source directory will now compare the upstream version number in ``debian/changelog`` with the latest available upstream version. If a new upstream version is found, it will be automatically downloaded. For example::"
3976
402
msgstr ""
3977
403
3978
404
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:322
3979
405
# a4a1f7731ea6433ca39eecbd57af3120
3980
406
msgid "For further information, see ``man uscan`` and the `watch file section (Section 4.11) <http://www.debian.org/doc/debian-policy/ch-source.html#s-debianwatch>`_ of the Debian Policy Manual."
3981
407
msgstr ""
3982
408
3983
409
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:326
3984
410
# 703b5d062b5c41e5a60cf8801b69b893
3985
411
msgid "For a list of packages where the ``watch`` file reports they are not in sync with upstream see `Ubuntu External Health Status <http://qa.ubuntuwire.org/uehs/no_updated.html>`_."
3986
412
msgstr ""
3987
413
3988
414
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:331
3989
415
# faa634aa8992448d86ad70c8669ceee1
3990
416
msgid "The source/format file"
3991
417
msgstr ""
3992
418
3993
419
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:333
3994
420
# a348a6a009424e0fa49a866e129573a2
3995
421
msgid "This file indicates the format of the source package. It should contain a single line indicating the desired format:"
3996
422
msgstr ""
3997
423
3998
424
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:336
3999
425
# 3d75a73a1fcd4342ab1fe865edf49644
4000
426
msgid "``3.0 (native)`` for Debian native packages (no upstream version)"
4001
427
msgstr ""
4002
428
4003
429
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:338
4004
430
# fd11f4ebad4d45bcbac715f3d8d4cc92
4005
431
msgid "``3.0 (quilt)`` for packages with a separate upstream tarball"
4006
432
msgstr ""
4007
433
4008
434
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:340
4009
435
# 1293ceef3ce04d30b640542aec2b476c
4010
436
msgid "``1.0`` for packages wishing to explicitly declare the default format"
4011
437
msgstr ""
4012
438
4013
439
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:342
4014
440
# 4e5d823b97ab4704aba10fb129ed0106
4015
441
msgid "Currently, the package source format will default to 1.0 if this file does not exist. You can make this explicit in the source/format file. If you choose not to use this file to define the source format, Lintian will warn about the missing file. This warning is informational only and may be safely ignored."
4016
442
msgstr ""
4017
443
4018
444
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:347
4019
445
# d7047d3e7c22489baedfec02eea21f25
4020
446
msgid "You are encouraged to use the newer 3.0 source format. It provides a number of new features:"
4021
447
msgstr ""
4022
448
4023
449
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:350
4024
450
# bc4e7971f98848ae9f1fb3fd8ee97ace
4025
451
msgid "Support for additional compression formats: bzip2, lzma and xz"
4026
452
msgstr ""
4027
453
4028
454
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:352
4029
455
# ddca8f575fac40e09adebd6d128ff676
4030
456
msgid "Support for multiple upstream tarballs"
4031
457
msgstr ""
4032
458
4033
459
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:354
4034
460
# aded08ffbdb7449d88dd6010fd97766f
4035
461
msgid "Not necessary to repack the upstream tarball to strip the debian directory"
4036
462
msgstr ""
4037
463
4038
464
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:356
4039
465
# b0f4d5d0c68e47de9ed8836f20a0e8be
4040
466
msgid "Debian-specific changes are no longer stored in a single .diff.gz but in multiple patches compatible with quilt under ``debian/patches/``"
4041
467
msgstr ""
4042
468
4043
469
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:358
4044
470
# 39b0c8ccca7e48b7af1af09d580e9f58
4045
471
msgid "http://wiki.debian.org/Projects/DebSrc3.0 summarizes additional information concerning the switch to the 3.0 source package formats."
4046
472
msgstr ""
4047
473
4048
474
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:361
4049
475
# 9d2f31ea080c47109ce2cdae3e87f14b
4050
476
msgid "See ``man dpkg-source`` and the `source/format section (Section 5.21) <http://www.debian.org/doc/manuals/maint-guide/dother.en.html#sourcef>`_  of the Debian New Maintainers' Guide for additional details."
4051
477
msgstr ""
4052
478
4053
479
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:366
4054
480
# 62fbf7d7bdcb49e782e64f2623b6f273
4055
481
msgid "Additional Resources"
4056
482
msgstr ""
4057
483
4058
484
#: ../ubuntu-packaging-guide/debian-dir-overview.rst:368
4059
485
# 039aa564015a48bda02c00b97d1ae2f3
4060
486
msgid "In addition to the links to the Debian Policy Manual in each section above, the Debian New Maintainers' Guide has more detailed descriptions of each file. `Chapter 4, \"Required files under the debian directory\" <http://www.debian.org/doc/maint-guide/dreq.en.html>`_ further discusses the control, changelog, copyright and rules files. `Chapter 5, \"Other files under the debian directory\" <http://www.debian.org/doc/maint-guide/dother.en.html>`_ discusses additional files that may be used."
4061
487
msgstr ""
4062
488
4063
489
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:3
4064
490
# 4be28eeaaecb4fffa9bcfb62c8828b58
4065
491
msgid "Fixing a bug in Ubuntu"
4066
492
msgstr ""
4067
493
4068
494
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:6
4069
495
#: ../ubuntu-packaging-guide/security-and-stable-release-updates.rst:9
4070
496
# 5973d64df73b4f8593c75fcac478a00e
4071
497
# e0956744ffbc47c08a5bb87b139bb113
4072
498
msgid "Introduction"
4073
499
msgstr ""
4074
500
4075
501
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:8
4076
502
# d4425948fa1e4b4fa3552113dc4dd00d
4077
503
msgid "If you followed the instructions to :doc:`get set up with Ubuntu Development<./getting-set-up>`, you should be all set and ready to go."
4078
504
msgstr ""
4079
505
4080
506
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:11
4081
507
# 02b036432f59412c82aed419f79fdb8c
4082
508
msgid "..image:: |IMG|fixing-a-bug.png"
4083
509
msgstr ""
4084
510
4085
511
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:13
4086
512
# 565e30b78a5c41b8990814dc8aaf9193
4087
513
msgid "As you can see in the image above, there is no surprises in the process of fixing bugs in Ubuntu: you found a problem, you get the code, work on the fix, test it, push your changes to Launchpad and ask for it to be reviewed and merged. In this guide we will go through all the necessary steps one by one."
4088
514
msgstr ""
4089
515
4090
516
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:20
4091
517
# 65a1fad6a3d04bbf8fc8932a8dbf6061
4092
518
msgid "Finding the problem"
4093
519
msgstr ""
4094
520
4095
521
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:22
4096
522
# e8e70d62917543ed8b9b8f081ba09518
4097
523
msgid "There are a lot of different ways to find things to work on. It might be a bug report you are encountering yourself (which gives you a good opportunity to test the fix), or a problem you noted elsewhere, maybe in a bug report."
4098
524
msgstr ""
4099
525
4100
526
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:26
4101
527
# 1c114b6ed4044179acbfa298d17e8687
4102
528
msgid "`Harvest <http://harvest.ubuntu.com/>`_ is where we keep track of various TODO lists regarding Ubuntu development. It lists bugs that were fixed upstream or in Debian already, lists small bugs (we call them 'bitesize'), and so on. Check it out and find your first bug to work on."
4103
529
msgstr ""
4104
530
4105
531
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:35
4106
532
# b454c63458594749aa09f9e587ed24a7
4107
533
msgid "Figuring out what to fix"
4108
534
msgstr ""
4109
535
4110
536
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:37
4111
537
# e80c8c6721fe41ddb9d3976bea810f18
4112
538
msgid "If you don't know the source package containing the code that has the problem, but you do know the path to the affected program on your system, you can discover the source package that you'll need to work on."
4113
539
msgstr ""
4114
540
4115
541
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:41
4116
542
# 4726f96b219c4bfeb111d18b723e771e
4117
543
msgid "Let's say you've found a bug in Tomboy, a note taking desktop application. The Tomboy application can be started by running ``/usr/bin/tomboy`` on the command line.  To find the binary package containing this application, use this command::"
4118
544
msgstr ""
4119
545
4120
546
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:48
4121
547
# dbf4f211a56f4f79b15bf42c6a835050
4122
548
msgid "This would print out::"
4123
549
msgstr ""
4124
550
4125
551
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:52
4126
552
# 682b18dbdfe142d2affc3e04e843783f
4127
553
msgid "Note that the part preceding the colon is the binary package name.  It's often the case that the source package and binary package will have different names. This is most common when a single source package is used to build multiple different binary packages.  To find the source package for a particular binary package, type::"
4128
554
msgstr ""
4129
555
4130
556
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:64
4131
557
# b7321dfe18ed434689e1617b5ad1b575
4132
558
msgid "Getting the code"
4133
559
msgstr ""
4134
560
4135
561
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:66
4136
562
# a88040229e1343e3a881389f2388861f
4137
563
msgid "Once you know the source package to work on, you will want to get a copy of the code on your system, so that you can debug it.  In Ubuntu Distributed Development this is done by :ref:`*branching* the source package <branching>` branch corresponding to the source package.  Launchpad maintains source package branches for all the packages in Ubuntu."
4138
564
msgstr ""
4139
565
4140
566
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:72
4141
567
# 92bb0cef4a5a4924afaff6a5bd97394f
4142
568
msgid "Once you've got a local branch of the source package, you can investigate the bug, create a fix, and upload your proposed fix to Launchpad, in the form of a Bazaar branch.  When you are happy with your fix, you can :ref:`submit a *merge proposal* <merge-proposal>`, which asks other Ubuntu developers to review and approve your change.  If they agree with your changes, an Ubuntu developer will upload the new version of the package to Ubuntu so that everyone gets the benefit of your excellent fix - and you get a little bit of credit.  You're now on your way to becoming an Ubuntu developer!"
4143
569
msgstr ""
4144
570
4145
571
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:81
4146
572
# 18ebcba0d9804cdcbd3d7b679124afba
4147
573
msgid "We'll describe specifics on how to branch the code, push your fix, and request a review in the following sections."
4148
574
msgstr ""
4149
575
4150
576
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:86
4151
577
# e8950446f9d643f9a88454cb13406165
4152
578
msgid "Work on a fix"
4153
579
msgstr ""
4154
580
4155
581
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:88
4156
582
# 0b597e2df21d4ffb9082682062b35f5b
4157
583
msgid "There are entire books written about finding bugs, fixing them, testing them, etc. If you are completely new to programming, try to fix easy bugs such as obvious typos first. Try to keep changes as minimal as possible and document your change and assumptions clearly."
4158
584
msgstr ""
4159
585
4160
586
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:93
4161
587
# 1cad1f33d073486abd5bbd7950da19e1
4162
588
msgid "Before working on a fix yourself, make sure to investigate if nobody else has fixed it already or is currently working on a fix. Good sources to check are:"
4163
589
msgstr ""
4164
590
4165
591
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:96
4166
592
# 9cd02b0b46194cb0a6e1c024c73d67bb
4167
593
msgid "Upstream (and Debian) bug tracker (open and closed bugs),"
4168
594
msgstr ""
4169
595
4170
596
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:97
4171
597
# fe3658bb50d6453d839bae201ab3e0d3
4172
598
msgid "Upstream revision history (or newer release) might have fixed the problem,"
4173
599
msgstr ""
4174
600
4175
601
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:98
4176
602
# dc982aac83c44804b15e226836d039fd
4177
603
msgid "bugs or package uploads of Debian or other distributions."
4178
604
msgstr ""
4179
605
4180
606
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:103
4181
607
# 3d5234f7f891414eac096bc475484247
4182
608
msgid "You now want to create a patch which includes the fix.  The command ``edit-patch`` is a simple way to add a patch to a package. Run::"
4183
609
msgstr ""
4184
610
4185
611
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:108
4186
612
# e09e4812312c4fdc854bd3814b092ebb
4187
613
msgid "This will copy the packaging to a temporary directory.  You can now edit files with a text editor or apply patches from upstream, for example::"
4188
614
msgstr ""
4189
615
4190
616
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:113
4191
617
# 8e00895b4bf64119869e26ce978cb55b
4192
618
msgid "After editing the file type ``exit`` or press ``control-d`` to quit the temporary shell.  The new patch will have been added into ``debian/patches``."
4193
619
msgstr ""
4194
620
4195
621
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:118
4196
622
# a5e56006a7db42a2b5b976f351e1a93a
4197
623
msgid "Testing the fix"
4198
624
msgstr ""
4199
625
4200
626
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:120
4201
627
# 29f45bb94cae448f9ff6bd53897237ab
4202
628
msgid "To build a test package with your changes, run these commands::"
4203
629
msgstr ""
4204
630
4205
631
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:125
4206
632
# 6fd80448fb9b40668a73b68d9aa82ee9
4207
633
msgid "This will create a source package from the branch contents (``-us -uc`` will just omit the step to sign the source package) and ``pbuilder-dist`` will build the package from source for whatever ``release`` you choose."
4208
634
msgstr ""
4209
635
4210
636
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:129
4211
637
# 7064dcf9f1ae4f49bacc8b5ebb79a4fb
4212
638
msgid "Once the build succeeds, install the package from ``~/pbuilder/<release>_result/`` (using ``sudo dpkg -i <package>_<version>.deb``).  Then test to see if the bug is fixed."
4213
639
msgstr ""
4214
640
4215
641
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:136
4216
642
# a498c34018d44bc083c421d3836bc292
4217
643
msgid "Documenting the fix"
4218
644
msgstr ""
4219
645
4220
646
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:138
4221
647
# 284aad9da256489bb9541ef9c9ed8050
4222
648
msgid "It is very important to document your change sufficiently so developers who look at the code in the future won't have to guess what your reasoning was and what your assumptions were. Every Debian and Ubuntu package source includes ``debian/changelog``, where changes of each uploaded package are tracked."
4223
649
msgstr ""
4224
650
4225
651
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:143
4226
652
# c560a925fc79452f85c60a462422febd
4227
653
msgid "The easiest way to update this is to run::"
4228
654
msgstr ""
4229
655
4230
656
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:147
4231
657
# fc6305e6f22b4bbe8f7ae46d9d2d36fe
4232
658
msgid "This will add a boilerplate changelog entry for you and launch an editor where you can fill in the blanks. An example of this could be::"
4233
659
msgstr ""
4234
660
4235
661
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:156
4236
662
# b4fcf5a54df94852b901b81d99177166
4237
663
msgid "``dch`` should fill out the first and last line of such a changelog entry for you already. Line 1 consists of the source package name, the version number, which Ubuntu release it is uploaded to, the urgency (which almost always is 'low'). The last line always contains the name, email address and timestamp (in :rfc:`5322` format) of the change."
4238
664
msgstr ""
4239
665
4240
666
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:162
4241
667
# 245b3f4735b2450db24ddca21be8e504
4242
668
msgid "With that out of the way, let's focus on the actual changelog entry itself: it is very important to document:"
4243
669
msgstr ""
4244
670
4245
671
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:165
4246
672
# 43f30ecd000741b2849656bfa9c6ae55
4247
673
msgid "where the change was done"
4248
674
msgstr ""
4249
675
4250
676
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:166
4251
677
# 6aa10c8f84ff4278888e5edc11cfdf66
4252
678
msgid "what was changed"
4253
679
msgstr ""
4254
680
4255
681
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:167
4256
682
# a48a34986f8248b891f819d4abcff85c
4257
683
msgid "where the discussion of the change happened"
4258
684
msgstr ""
4259
685
4260
686
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:169
4261
687
# b5105651513148e58182645ef1350d2b
4262
688
msgid "In our (very sparse) example the last point is covered by ``(LP: #123456)`` which refers to Launchpad bug 123456. Bug reports or mailing list threads or specifications are usually good information to provide as a rationale for a change. As a bonus, if you use the ``LP: #<number>`` notation for Launchpad bugs, the bug will be automatically closed when the package is uploaded to Ubuntu."
4263
689
msgstr ""
4264
690
4265
691
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:178
4266
692
# 7e3ca41954e44f68bcbe1755d6a53f74
4267
693
msgid "Committing the fix"
4268
694
msgstr ""
4269
695
4270
696
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:180
4271
697
# 8931133984c348d5991fb0d11db638e0
4272
698
msgid "With the changelog entry written and saved, you can just run::"
4273
699
msgstr ""
4274
700
4275
701
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:184
4276
702
# 694988e85f33437b9af1ab2c8a9192af
4277
703
msgid "and the change will be committed (locally) with your changelog entry as a commit message."
4278
704
msgstr ""
4279
705
4280
706
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:187
4281
707
# c7c33ddc56cd406cb79afea806a24ab7
4282
708
msgid "To push it to Launchpad, as the remote branch name, you need to stick to the following nomenclature::"
4283
709
msgstr ""
4284
710
4285
711
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:192
4286
712
# d43eb74f6725404a8e0c12ee36207d3d
4287
713
msgid "This could for example be::"
4288
714
msgstr ""
4289
715
4290
716
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:196
4291
717
# 9c95cd25baca4246bf40816093dc7f7a
4292
718
msgid "So if you just run::"
4293
719
msgstr ""
4294
720
4295
721
#: ../ubuntu-packaging-guide/fixing-a-bug.rst:201
4296
722
# 5aa8ae3e79484b43bf7f43d93010513b
4297
723
msgid "you should be all set. The push command should push it to Launchpad and the second command will open the Launchpad page of the remote branch in your browser. There find the \"(+) Propose for merging\" link, click it to get the change reviewed by somebody and included in Ubuntu."
4298
724
msgstr ""
4299
725
4300
726
#: ../ubuntu-packaging-guide/getting-set-up.rst:3
4301
727
# 83f85e65560046f4b62f45e17b49a17a
4302
728
msgid "Getting Set Up"
4303
729
msgstr ""
4304
730
4305
731
#: ../ubuntu-packaging-guide/getting-set-up.rst:5
4306
732
# a66b7a19ac434a5a909505514b2926ca
4307
733
msgid "There are a number of things you need to do to get started developing for Ubuntu. This article is designed to get your computer set up so that you can start working with packages, and upload your packages to Ubuntu's hosting platform, Launchpad. Here's what we'll cover:"
4308
734
msgstr ""
4309
735
4310
736
#: ../ubuntu-packaging-guide/getting-set-up.rst:10
4311
737
# 086a9c5ecf2d449b82843d303d58a164
4312
738
msgid "Installing packaging-related software. This includes:"
4313
739
msgstr ""
4314
740
4315
741
#: ../ubuntu-packaging-guide/getting-set-up.rst:12
4316
742
# 400b8ae2a4554bb484ea4554b8fdd56d
4317
743
msgid "Ubuntu-specific packaging utilities"
4318
744
msgstr ""
4319
745
4320
746
#: ../ubuntu-packaging-guide/getting-set-up.rst:13
4321
747
# e062bc0cc3ed4294b33616a98d4a5a4d
4322
748
msgid "Encryption software so your work can be verified as being done by you"
4323
749
msgstr ""
4324
750
4325
751
#: ../ubuntu-packaging-guide/getting-set-up.rst:14
4326
752
# 925d91caef104cb7afa6001f05680be9
4327
753
msgid "Additional encryption software so you can securely transfer files"
4328
754
msgstr ""
4329
755
4330
756
#: ../ubuntu-packaging-guide/getting-set-up.rst:16
4331
757
# b0e396c2d5f4463c96d854f06c659d6a
4332
758
msgid "Creating and configuring your account on Launchpad"
4333
759
msgstr ""
4334
760
4335
761
#: ../ubuntu-packaging-guide/getting-set-up.rst:17
4336
762
# 4d333df7195b41f6b125d660b2a1c300
4337
763
msgid "Setting up your development environment to help you do local builds of packages, interact with other developers, and propose your changes on Launchpad."
4338
764
msgstr ""
4339
765
4340
766
#: ../ubuntu-packaging-guide/getting-set-up.rst:22
4341
767
# 9c69c6eea045429a8a34b6fe96139751
4342
768
msgid "It is advisable to do packaging work using the current development version of Ubuntu. Doing so will allow you to test changes in the same environment where those changes will actually be applied and used."
4343
769
msgstr ""
4344
770
4345
771
#: ../ubuntu-packaging-guide/getting-set-up.rst:26
4346
772
# 7c484a283dd34e39a18323d9beac87f9
4347
773
msgid "Don't worry though, the `Ubuntu development release wiki page <https://wiki.ubuntu.com/UsingDevelopmentReleases>`_ shows a variety of ways to safely use the development release."
4348
774
msgstr ""
4349
775
4350
776
#: ../ubuntu-packaging-guide/getting-set-up.rst:32
4351
777
# b98ebc64ff574a5dbf0bdbd1df7a6c8f
4352
778
msgid "Install basic packaging software"
4353
779
msgstr ""
4354
780
4355
781
#: ../ubuntu-packaging-guide/getting-set-up.rst:34
4356
782
# 808a29c5f38f448eb25ca66e04792f0f
4357
783
msgid "There are a number of tools that will make your life as an Ubuntu developer much easier.  You will encounter these tools later in this guide.  To install most of the tools you will need run this command::"
4358
784
msgstr ""
4359
785
4360
786
#: ../ubuntu-packaging-guide/getting-set-up.rst:41
4361
787
# fac16697cacf4355a80e8f5b88f324a0
4362
788
msgid "Note: Since Ubuntu 11.10 \"Oneiric Ocelot\" (or if you have Backports enabled on a currently supported release), the following command will install the above and other tools which are quite common in Ubuntu development::"
4363
789
msgstr ""
4364
790
4365
791
#: ../ubuntu-packaging-guide/getting-set-up.rst:49
4366
792
# 49e40cea430146ec8c2692a2a6bcd425
4367
793
msgid "This command will install the following software:"
4368
794
msgstr ""
4369
795
4370
796
#: ../ubuntu-packaging-guide/getting-set-up.rst:51
4371
797
# 4e959df03bee4ba6a973d4f2cbffec9d
4372
798
msgid "``gnupg`` -- `GNU Privacy Guard`_ contains tools you will need to create a cryptographic key with which you will sign files you want to upload to Launchpad."
4373
799
msgstr ""
4374
800
4375
801
#: ../ubuntu-packaging-guide/getting-set-up.rst:54
4376
802
# 1c457996b9ff49cfb8720509a4314a6d
4377
803
msgid "``pbuilder`` -- a tool to do a reproducible builds of a package in a clean and isolated environment."
4378
804
msgstr ""
4379
805
4380
806
#: ../ubuntu-packaging-guide/getting-set-up.rst:56
4381
807
# e9c0f3fd07be45c2928f88eb383771ed
4382
808
msgid "``ubuntu-dev-tools`` (and ``devscripts``, a direct dependency) -- a collection of tools that make many packaging tasks easier."
4383
809
msgstr ""
4384
810
4385
811
#: ../ubuntu-packaging-guide/getting-set-up.rst:58
4386
812
# 29db292e4464422eb0e4e6222af33ef5
4387
813
msgid "``bzr-builddeb`` (and ``bzr``, a dependency) -- distributed version control with Bazaar, a new way of working with packages for Ubuntu that will make it easy for many developers to collaborate and work on the same code while keeping it trivial to merge each others work."
4388
814
msgstr ""
4389
815
4390
816
#: ../ubuntu-packaging-guide/getting-set-up.rst:62
4391
817
# 9f5925a4d2014953af7c6070b31a157c
4392
818
msgid "``apt-file`` provides an easy way to find the binary package that contains a given file."
4393
819
msgstr ""
4394
820
4395
821
#: ../ubuntu-packaging-guide/getting-set-up.rst:64
4396
822
# 2110c86d771140b7bc69c2958b28464d
4397
823
msgid "``apt-cache`` (part of the ``apt`` package) provides even more information about packages on Ubuntu."
4398
824
msgstr ""
4399
825
4400
826
#: ../ubuntu-packaging-guide/getting-set-up.rst:69
4401
827
# 0a14b46fec014f97bd7557e4d9258941
4402
828
msgid "Create your GPG key"
4403
829
msgstr ""
4404
830
4405
831
#: ../ubuntu-packaging-guide/getting-set-up.rst:71
4406
832
# 16d8e0261d5a48dfb0ff6aeede808b34
4407
833
msgid "GPG stands for `GNU Privacy Guard`_ and it implements the OpenPGP standard which allows you to sign and encrypt messages and files. This is useful for a number of purposes. In our case it is important that you can sign files with your key so they can be identified as something that you worked on. If you upload a source package to Launchpad, it will only accept the package if it can absolutely determine who uploaded the package."
4408
834
msgstr ""
4409
835
4410
836
#: ../ubuntu-packaging-guide/getting-set-up.rst:78
4411
837
# c25b4a7c3abd47c4adab9c0d4a8f88e4
4412
838
msgid "To generate a new GPG key, run::"
4413
839
msgstr ""
4414
840
4415
841
#: ../ubuntu-packaging-guide/getting-set-up.rst:82
4416
842
# 854929b1b9b74e56a91d8cdac1b6ccbf
4417
843
msgid "GPG will first ask you which kind of key you want to generate. Choosing the default (RSA and DSA) is fine. Next it will ask you about the keysize. The default (currently 2048) is fine, but 4096 is more secure. Afterward, it will ask you if you want it to expire the key at some stage. It is safe to say \"0\", which means the key will never expire. The last questions will be about your name and email address. Just pick the ones you are going to use for Ubuntu development here, you can add additional email addresses later on. Adding a comment is not necessary. Then you will have to set a passphrase, choose a safe one (a passphrase is just a password which is allowed to include spaces)."
4418
844
msgstr ""
4419
845
4420
846
#: ../ubuntu-packaging-guide/getting-set-up.rst:92
4421
847
# c9411759e55c44f7b4ff04ab876850e9
4422
848
msgid "Now GPG will create a key for you, which can take a little bit of time; it needs random bytes, so if you give the system some work to do it will be just fine.  Move the cursor around, type some paragraphs of random text, load some web page."
4423
849
msgstr ""
4424
850
4425
851
#: ../ubuntu-packaging-guide/getting-set-up.rst:97
4426
852
# 671e66dd26de4cc19167919c4cacf056
4427
853
msgid "Once this is done, you will get a message similar to this one::"
4428
854
msgstr ""
4429
855
4430
856
#: ../ubuntu-packaging-guide/getting-set-up.rst:104
4431
857
# fbcfbe47756f426092c3860dad3c1fec
4432
858
msgid "In this case ``43CDE61D`` is the *key ID*."
4433
859
msgstr ""
4434
860
4435
861
#: ../ubuntu-packaging-guide/getting-set-up.rst:106
4436
862
# 5bcf72402a81478a8210db244d7a62f9
4437
863
msgid "Next, you need to upload the public part of your key to a keyserver so the world can identify messages and files as yours. To do so, enter::"
4438
864
msgstr ""
4439
865
4440
866
#: ../ubuntu-packaging-guide/getting-set-up.rst:111
4441
867
# 457a5844d06c44969821537e48cdf762
4442
868
msgid "This will send your key to one keyserver, but a network of keyservers will automatically sync the key between themselves. Once this syncing is complete, your signed public key will be ready to verify your contributions around the world."
4443
869
msgstr ""
4444
870
4445
871
#: ../ubuntu-packaging-guide/getting-set-up.rst:118
4446
872
# bbd6cfc0f36241b9afc8304a4955b10f
4447
873
msgid "Create your SSH key"
4448
874
msgstr ""
4449
875
4450
876
#: ../ubuntu-packaging-guide/getting-set-up.rst:120
4451
877
# cbe44e54369c43ccbaf972bb10995704
4452
878
msgid "SSH_ stands for *Secure Shell*, and it is a protocol that allows you to exchange data in a secure way over a network. It is common to use SSH to access and open a shell on another computer, and to use it to securely transfer files. For our purposes, we will mainly be using SSH to securely upload source packages to Launchpad."
4453
879
msgstr ""
4454
880
4455
881
#: ../ubuntu-packaging-guide/getting-set-up.rst:126
4456
882
# 15220156465043d89c0f0a526b3ae31d
4457
883
msgid "To generate an SSH key, enter::"
4458
884
msgstr ""
4459
885
4460
886
#: ../ubuntu-packaging-guide/getting-set-up.rst:130
4461
887
# 4369607909e54d2eb28b701b18832582
4462
888
msgid "The default file name usually makes sense, so you can just leave it as it is. For security purposes, it is highly recommended that you use a passphrase."
4463
889
msgstr ""
4464
890
4465
891
#: ../ubuntu-packaging-guide/getting-set-up.rst:135
4466
892
# 4709c05c499e4a29bd71f5f1aef90b23
4467
893
msgid "Set up pbuilder"
4468
894
msgstr ""
4469
895
4470
896
#: ../ubuntu-packaging-guide/getting-set-up.rst:137
4471
897
# 74362386ed8340f2b5c45b2bdb9a08da
4472
898
msgid "``pbuilder`` allows you to build packages locally on your machine. It serves a couple of purposes:"
4473
899
msgstr ""
4474
900
4475
901
#: ../ubuntu-packaging-guide/getting-set-up.rst:140
4476
902
# 93aa3aaf40b44beb8662c330374e4e50
4477
903
msgid "The build will be done in a minimal and clean environment. This helps you make sure your builds succeed in a reproducible way, but without modifying your local system"
4478
904
msgstr ""
4479
905
4480
906
#: ../ubuntu-packaging-guide/getting-set-up.rst:143
4481
907
# 5169282689aa4be29c874e27633030f0
4482
908
msgid "There is no need to install all necessary *build dependencies* locally"
4483
909
msgstr ""
4484
910
4485
911
#: ../ubuntu-packaging-guide/getting-set-up.rst:144
4486
912
# c97e8554b32d4e71965f1ff6479f13b6
4487
913
msgid "You can set up multiple instances for various Ubuntu and Debian releases"
4488
914
msgstr ""
4489
915
4490
916
#: ../ubuntu-packaging-guide/getting-set-up.rst:146
4491
917
# 6a4d016f67b64cf3bbe9148306cbb3b8
4492
918
msgid "Setting ``pbuilder`` up is very easy, run::"
4493
919
msgstr ""
4494
920
4495
921
#: ../ubuntu-packaging-guide/getting-set-up.rst:150
4496
922
# fa64536c0c324d27983772c20599b26c
4497
923
msgid "where <release> is for example `natty`, `maverick`, `lucid` or in the case of Debian maybe `sid`. This will take a while as it will download all the necessary packages for a \"minimal installation\". These will be cached though."
4498
924
msgstr ""
4499
925
4500
926
#: ../ubuntu-packaging-guide/getting-set-up.rst:156
4501
927
# 5dc23eff94724361a73a59dea44289e7
4502
928
msgid "Get set up to work with Launchpad"
4503
929
msgstr ""
4504
930
4505
931
#: ../ubuntu-packaging-guide/getting-set-up.rst:158
4506
932
# 95fadc8adf9f4a0e91bac3115a3d0cf1
4507
933
msgid "With a basic local configuration in place, your next step will be to configure your system to work with Launchpad. This section will focus on the following topics:"
4508
934
msgstr ""
4509
935
4510
936
#: ../ubuntu-packaging-guide/getting-set-up.rst:162
4511
937
# b79f07693785483782ed6821e0a0b9ef
4512
938
msgid "What Launchpad is and creating a Launchpad account"
4513
939
msgstr ""
4514
940
4515
941
#: ../ubuntu-packaging-guide/getting-set-up.rst:163
4516
942
# e32ac038b50b4d829f13044673ba85bc
4517
943
msgid "Uploading your GPG and SSH keys to Launchpad"
4518
944
msgstr ""
4519
945
4520
946
#: ../ubuntu-packaging-guide/getting-set-up.rst:164
4521
947
# 50d201d98b2747bf9b900ebd2033d4b6
4522
948
msgid "Configuring Bazaar to work with Launchpad"
4523
949
msgstr ""
4524
950
4525
951
#: ../ubuntu-packaging-guide/getting-set-up.rst:165
4526
952
# 2fcbff75feec47c890b29ae9a0accc58
4527
953
msgid "Configuring Bash to work with Bazaar"
4528
954
msgstr ""
4529
955
4530
956
#: ../ubuntu-packaging-guide/getting-set-up.rst:169
4531
957
# 7d3092a6e1a142afa5c22a094e2be344
4532
958
msgid "About Launchpad"
4533
959
msgstr ""
4534
960
4535
961
#: ../ubuntu-packaging-guide/getting-set-up.rst:171
4536
962
# c032fdb17ad44f8a9972c7b1160387dd
4537
963
msgid "Launchpad is the central piece of infrastructure we use in Ubuntu. It not only stores our packages and our code, but also things like translations, bug reports, and information about the people who work on Ubuntu and their team memberships.  You will also use Launchpad to publish your proposed fixes, and get other Ubuntu developers to review and sponsor them."
4538
964
msgstr ""
4539
965
4540
966
#: ../ubuntu-packaging-guide/getting-set-up.rst:177
4541
967
# ad9d175d99654dad8e2c830c4beecab0
4542
968
msgid "You will need to register with Launchpad and provide a minimal amount of information. This will allow you to download and upload code, submit bug reports, and more."
4543
969
msgstr ""
4544
970
4545
971
#: ../ubuntu-packaging-guide/getting-set-up.rst:181
4546
972
# 0c25cf1d67e14ebc9621decebd78ef5c
4547
973
msgid "Besides hosting Ubuntu, Launchpad can host any Free Software project. For more information see the `Launchpad Help wiki <https://help.launchpad.net/>`_."
4548
974
msgstr ""
4549
975
4550
976
#: ../ubuntu-packaging-guide/getting-set-up.rst:186
4551
977
# 1060bd4edaa345a9a90d8c2e34628202
4552
978
msgid "Get a Launchpad account"
4553
979
msgstr ""
4554
980
4555
981
#: ../ubuntu-packaging-guide/getting-set-up.rst:188
4556
982
# 308e70601909430d842502f21e1589ad
4557
983
msgid "If you don't already have a Launchpad account, you can easily `create one`_. If you have a Launchpad account but cannot remember your Launchpad id, you can find this out by going to https://launchpad.net/~ and looking for the part after the `~` in the URL."
4558
984
msgstr ""
4559
985
4560
986
#: ../ubuntu-packaging-guide/getting-set-up.rst:193
4561
987
# a0e1270b66884075a0074a83105aded1
4562
988
msgid "Launchpad's registration process will ask you to choose a display name. It is encouraged for you to use your real name here so that your Ubuntu developer colleagues will be able to get to know you better."
4563
989
msgstr ""
4564
990
4565
991
#: ../ubuntu-packaging-guide/getting-set-up.rst:197
4566
992
# 7f4a08d3ce224e59b0d23ba2f4bc4b15
4567
993
msgid "When you register a new account, Launchpad will send you an email with a link you need to open in your browser in order to verify your email address. If you don't receive it, check in your spam folder."
4568
994
msgstr ""
4569
995
4570
996
#: ../ubuntu-packaging-guide/getting-set-up.rst:201
4571
997
# ff7522539ab64385b5e3460fec3e6c7f
4572
998
msgid "`The new account help page <https://help.launchpad.net/YourAccount/NewAccount>`_ on Launchpad has more information about the process and additional settings you can change."
4573
999
msgstr ""
4574
1000
4575
1001
#: ../ubuntu-packaging-guide/getting-set-up.rst:207
4576
1002
# 8a4be4c66e1e4e4bbd19c1d319bb28bc
4577
1003
msgid "Upload your GPG key to Launchpad"
4578
1004
msgstr ""
4579
1005
4580
1006
#: ../ubuntu-packaging-guide/getting-set-up.rst:209
4581
1007
# 506b5b99e7ac4c87ae989c190b86e41a
4582
1008
msgid "To find about your GPG fingerprint, run::"
4583
1009
msgstr ""
4584
1010
4585
1011
#: ../ubuntu-packaging-guide/getting-set-up.rst:213
4586
1012
# 472d7ced0c4c4d6da22703585fa46fe7
4587
1013
msgid "and it will print out something like::"
4588
1014
msgstr ""
4589
1015
4590
1016
#: ../ubuntu-packaging-guide/getting-set-up.rst:221
4591
1017
# 0c821916735d4f45a78d52e91ef3239e
4592
1018
msgid "Head to https://launchpad.net/~/+editpgpkeys and copy the \"Key fingerprint\" into the text box. In the case above this would be ``5C28 0144 FB08 91C0 2CF3  37AC 6F0B F90F 43CD E61D``. Now click on \"Import Key\"."
4593
1019
msgstr ""
4594
1020
4595
1021
#: ../ubuntu-packaging-guide/getting-set-up.rst:226
4596
1022
# ec669b136a8c42269d9abfeb85d34c09
4597
1023
msgid "Launchpad will use the fingerprint to check the Ubuntu key server for your key and, if successful, send you an encrypted email asking you to confirm the key import. Check your email account and read the email that Launchpad sent you. `If your email client supports OpenPGP encryption, it will prompt you for the password you chose for the key when GPG generated it. Enter the password, then click the link to confirm that the key is yours.`"
4598
1024
msgstr ""
4599
1025
4600
1026
#: ../ubuntu-packaging-guide/getting-set-up.rst:233
4601
1027
# f08b21d4e43b485194ec184975a04f7f
4602
1028
msgid "Launchpad encrypts the email, using your public key, so that it can be sure that the key is yours. If your email software does not support OpenPGP encryption, copy the encrypted email's contents, type ``gpg`` in your terminal, then paste the email contents into your terminal window."
4603
1029
msgstr ""
4604
1030
4605
1031
#: ../ubuntu-packaging-guide/getting-set-up.rst:238
4606
1032
# b7455eb7f4da4959b24ef5339b994d19
4607
1033
msgid "Back on the Launchpad website, use the Confirm button and Launchpad will complete the import of your OpenPGP key."
4608
1034
msgstr ""
4609
1035
4610
1036
#: ../ubuntu-packaging-guide/getting-set-up.rst:241
4611
1037
# 8b0f15062c314bd5bc0578ab0db7233b
4612
1038
msgid "Find more information at https://help.launchpad.net/YourAccount/ImportingYourPGPKey"
4613
1039
msgstr ""
4614
1040
4615
1041
#: ../ubuntu-packaging-guide/getting-set-up.rst:245
4616
1042
# c7408c90022943d2b2adb9e67b8c079d
4617
1043
msgid "Upload your SSH key to Launchpad"
4618
1044
msgstr ""
4619
1045
4620
1046
#: ../ubuntu-packaging-guide/getting-set-up.rst:247
4621
1047
# d55a8885d648402ebc1c8bfa9de5b62a
4622
1048
msgid "Open https://launchpad.net/~/+editsshkeys in a web browser, also open ``~/.ssh/id_rsa.pub`` in a text editor. This is the public part of your SSH key, so it is safe to share it with Launchpad. Copy the contents of the file and paste them into the text box on the web page that says \"Add an SSH key\". Now click \"Import Public Key\"."
4623
1049
msgstr ""
4624
1050
4625
1051
#: ../ubuntu-packaging-guide/getting-set-up.rst:253
4626
1052
# d94df3105f334f17a6b8b4493abb7237
4627
1053
msgid "For more information on this process, visit the `<creating an SSH keypair <https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair>`_ page on Launchpad."
4628
1054
msgstr ""
4629
1055
4630
1056
#: ../ubuntu-packaging-guide/getting-set-up.rst:259
4631
1057
# 8452a24ce68f4df6ac5e44518ef879ad
4632
1058
msgid "Configure Bazaar"
4633
1059
msgstr ""
4634
1060
4635
1061
#: ../ubuntu-packaging-guide/getting-set-up.rst:261
4636
1062
# 2200087023b540598f73cba55e6d1e43
4637
1063
msgid "Bazaar is the tool we use to store code changes in a logical way, to exchange proposed changes and merge them, even if development is done concurrently.  It is used for the new Ubuntu Distributed Development method of working with Ubuntu packages."
4638
1064
msgstr ""
4639
1065
4640
1066
#: ../ubuntu-packaging-guide/getting-set-up.rst:266
4641
1067
# 6809b71125db4a1c9a7039c20642d0c5
4642
1068
msgid "To tell Bazaar who you are, simply run::"
4643
1069
msgstr ""
4644
1070
4645
1071
#: ../ubuntu-packaging-guide/getting-set-up.rst:271
4646
1072
# a7bbc2cbc2104be08887d3f357de5253
4647
1073
msgid "`whoami` will tell Bazaar which name and email address it should use for your commit messages. With `launchpad-login` you set your Launchpad ID. This way code that you publish in Launchpad will be associated with you."
4648
1074
msgstr ""
4649
1075
4650
1076
#: ../ubuntu-packaging-guide/getting-set-up.rst:275
4651
1077
# b91245d32a2440a583e602e2b0c85ac3
4652
1078
msgid "Note: If you can not remember the ID, go to https://launchpad.net/~ and see where it redirects you. The part after the \"~\" in the URL is your Launchpad ID.)"
4653
1079
msgstr ""
4654
1080
4655
1081
#: ../ubuntu-packaging-guide/getting-set-up.rst:281
4656
1082
# e267401effd84ebe9fad680ad51c3cd9
4657
1083
msgid "Configure your shell"
4658
1084
msgstr ""
4659
1085
4660
1086
#: ../ubuntu-packaging-guide/getting-set-up.rst:282
4661
1087
# c497e7fe9aed473fac7283134a606445
4662
1088
msgid "Similar to Bazaar, the Debian/Ubuntu packaging tools need to learn about you as well. Simply open your `~/.bashrc` in a text editor and add something like this to the bottom of it::"
4663
1089
msgstr ""
4664
1090
4665
1091
#: ../ubuntu-packaging-guide/getting-set-up.rst:289
4666
1092
# f1400dd33613411caa2495b24cb8901b
4667
1093
msgid "Now save the file and either restart your terminal or run::"
4668
1094
msgstr ""
4669
1095
4670
1096
#: ../ubuntu-packaging-guide/getting-set-up.rst:293
4671
1097
# 71fcef52c0ce4c6a9f9e098c4f35cd1a
4672
1098
msgid "(If you do not use the default shell, which is `bash`, please edit the configuration file for that shell accordingly.)"
4673
1099
msgstr ""
4674
1100
4675
1101
#: ../ubuntu-packaging-guide/index.rst:7
4676
1102
# 2b2c79c0f4744aa6ac31ab4d14510523
4677
1103
msgid "Ubuntu Packaging Guide"
4678
1104
msgstr ""
4679
1105
4680
1106
#: ../ubuntu-packaging-guide/index.rst:9
4681
1107
# 2804b34604314864a75fcd88568b92f0
4682
1108
msgid "Ubuntu is not only a free and open source operating system, its platform is also open and developed in a transparent fashion. The source code for every single component can be obtained easily and every single change to the Ubuntu platform can be reviewed."
4683
1109
msgstr ""
4684
1110
4685
1111
#: ../ubuntu-packaging-guide/index.rst:14
4686
1112
# e4717243c36b4fbaa8a4ab4731b7c6a2
4687
1113
msgid "This means you can actively get involved in improving it and the community of Ubuntu platform developers is always interested in helping peers getting started."
4688
1114
msgstr ""
4689
1115
4690
1116
#: ../ubuntu-packaging-guide/index.rst:18
4691
1117
# a8931d21f1314e2abf31996f75be3676
4692
1118
msgid "The guide is split up into two sections:"
4693
1119
msgstr ""
4694
1120
4695
1121
#: ../ubuntu-packaging-guide/index.rst:20
4696
1122
# 4432017dc60141218901d1062a4db48d
4697
1123
msgid "A list of articles based on tasks, things you want to get done."
4698
1124
msgstr ""
4699
1125
4700
1126
#: ../ubuntu-packaging-guide/index.rst:21
4701
1127
# 0d65327272d34bd094988cd9f7ec6044
4702
1128
msgid "A set of knowledge-base articles that dig deeper into specific bits of our tools and workflows."
4703
1129
msgstr ""
4704
1130
4705
1131
#: ../ubuntu-packaging-guide/index.rst:24
4706
1132
# e9691f9962684fa2983959309c708dc6
4707
1133
msgid "This guide focuses on the Ubuntu Distributed Development packaging method. This is a new way of packaging which uses Distributed Revision Control branches.  It currently has some limitations which mean many teams in Ubuntu use :doc:`traditional packaging<./traditional-packaging>` methods.  See the :doc:`UDD Introduction<./udd-intro>` page for an introduction to the differences."
4708
1134
msgstr ""
4709
1135
4710
1136
#: ../ubuntu-packaging-guide/index.rst:31
4711
1137
# 35611cc67071493d95b0fd914f093f18
4712
1138
msgid "Articles"
4713
1139
msgstr ""
4714
1140
4715
1141
#: ../ubuntu-packaging-guide/index.rst:46
4716
1142
# 341532acc9554b0d9d4a83f5a043fdf9
4717
1143
msgid "Knowledge Base"
4718
1144
msgstr ""
4719
1145
4720
1146
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:3
4721
1147
# 795cb22fada7442f821a6d3640677ae7
4722
1148
msgid "Introduction to Ubuntu Development"
4723
1149
msgstr ""
4724
1150
4725
1151
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:5
4726
1152
# d1e2a2fc83084defb2029936d7af82db
4727
1153
msgid "Ubuntu is made up of thousands of different components, written in many different programming languages. Every component -  be it a software library, a tool or a graphical application - is available as a source package. Source packages in most cases consist of two parts: the actual source code and metadata. Metadata includes the dependencies of the package, copyright and licensing information, and instructions on how to build the package. Once this source package is compiled, the build process provides binary packages, which are the .deb files users can install."
4728
1154
msgstr ""
4729
1155
4730
1156
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:14
4731
1157
# d092727879c148148df7ae3a396ba4c1
4732
1158
msgid "Every time a new version of an application is released, or when someone makes a change to the source code that goes into Ubuntu, the source package must be uploaded to Launchpad's build machines to be compiled. The resulting binary packages then are distributed to the archive and its mirrors in different countries. The URLs in ``/etc/apt/sources.list`` point to an archive or mirror. Every day CD images are built for a selection of different Ubuntu flavours. Ubuntu Desktop, Ubuntu Server, Kubuntu and others specify a list of required packages that get on the CD. These CD images are then used for installation tests and provide the feedback for further release planning."
4733
1159
msgstr ""
4734
1160
4735
1161
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:24
4736
1162
# 6e37b4d95d8541b7aa3011844140dfd8
4737
1163
msgid "Ubuntu's development is very much dependent on the current stage of the release cycle. We release a new version of Ubuntu every six months, which is only possible because we have established strict freeze dates. With every freeze date that is reached developers are expected to make fewer, less intrusive changes. Feature Freeze is the first big freeze date after the first half of the cycle has passed. At this stage features must be largely implemented. The rest of the cycle is supposed to be focused on fixing bugs. After that the user interface, then the documentation, the kernel, etc. are frozen, then the beta release is put out which receives a lot of testing. From the beta release onwards, only critical bugs get fixed and a release candidate release is made and if it does not contain any serious problems, it becomes the final release."
4738
1164
msgstr ""
4739
1165
4740
1166
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:39
4741
1167
# 3095f0dc21b845bd9adafbc230310de6
4742
1168
msgid "Thousands of source packages, billions of lines of code, hundreds of contributors require a lot of communication and planning to maintain high standards of quality. At the beginning of each release cycle we have the Ubuntu Developer Summit where developers and contributors come together to plan the features of the next releases. Every feature is discussed by its stakeholders and a specification is written that contains detailed information about its assumptions, implementation, the necessary changes in other places, how to test it and so on. This is all done in an open and transparent fashion, so even if you can not attend the event in person, you can participate remotely and listen to a streamcast, chat with attendants and subscribe to changes of specifications, so you are always up to date."
4743
1169
msgstr ""
4744
1170
4745
1171
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:51
4746
1172
# c2c9a07df8734bcd84811b0d08005493
4747
1173
msgid "Not every single change can be discussed in a meeting though, particularly because Ubuntu relies on changes that are done in other projects. That is why contributors to Ubuntu constantly stay in touch. Most teams or projects use dedicated mailing lists to avoid too much unrelated noise. For more immediate coordination, developers and contributors use Internet Relay Chat (IRC). All discussions are open and public."
4748
1174
msgstr ""
4749
1175
4750
1176
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:58
4751
1177
# 89290a1fefbc4e5a87353e069aeb79ac
4752
1178
msgid "Another important tool regarding communication is bug reports. Whenever a defect is found in a package or piece of infrastructure, a bug report is filed in Launchpad. All information is collected in that report and its importance, status and assignee updated when necessary. This makes it an effective tool to stay on top of bugs in a package or project and organise the workload."
4753
1179
msgstr ""
4754
1180
4755
1181
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:65
4756
1182
# 224c0402acf54540b6e21eb5498d8bf9
4757
1183
msgid "Most of the software available through Ubuntu is not written by Ubuntu developers themselves. Most of it is written by developers of other Open Source projects and then integrated into Ubuntu. These projects are called \"Upstreams\", because their source code flows into Ubuntu, where we \"just\" integrate it. The relationship to Upstreams is critically important to Ubuntu. It is not just code that Ubuntu gets from Upstreams, but it is also that Upstreams get users, bug reports and patches from Ubuntu (and other distributions)."
4758
1184
msgstr ""
4759
1185
4760
1186
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:74
4761
1187
# 7b06da07d99842fd9738c38140dd2a16
4762
1188
msgid "The most important Upstream for Ubuntu is Debian. Debian is the distribution that Ubuntu is based on and many of the design decisions regarding the packaging infrastructure are made there. Traditionally, Debian has always had dedicated maintainers for every single package or dedicated maintenance teams. In Ubuntu there are teams that have an interest in a subset of packages too, and naturally every developer has a special area of expertise, but participation (and upload rights) generally is open to everyone who demonstrates ability and willingness."
4763
1189
msgstr ""
4764
1190
4765
1191
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:83
4766
1192
# c04e0435ba0d4bb38160660e3cda4ca0
4767
1193
msgid "Getting a change into Ubuntu as a new contributor is not as daunting as it seems and can be a very rewarding experience. It is not only about learning something new and exciting, but also about sharing the solution and solving a problem for millions of users out there."
4768
1194
msgstr ""
4769
1195
4770
1196
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:88
4771
1197
# 72ea8fca34b04f5eb28aae4b06eaa638
4772
1198
msgid "Open Source Development happens in a distributed world with different goals and different areas of focus. For example there might be the case that a particular Upstream might be interested in working on a new big feature while Ubuntu, because of the tight release schedule, might be interested in shipping a solid version with just an additional bug fix. That is why we make use of \"Distributed Development\", where code is being worked on in various branches that are merged with each other after code reviews and sufficient discussion."
4773
1199
msgstr ""
4774
1200
4775
1201
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:98
4776
1202
# 38a1680f15f04e2785f959f32e8b7311
4777
1203
msgid "In the example mentioned above it would make sense to ship Ubuntu with the existing version of the project, add the bugfix, get it into Upstream for their next release and ship that (if suitable) in the next Ubuntu release. It would be the best possible compromise and a situation where everybody wins."
4778
1204
msgstr ""
4779
1205
4780
1206
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:103
4781
1207
# b1e0446cdaa9426cb9aa082ca826788c
4782
1208
msgid "To fix a bug in Ubuntu, you would first get the source code for the package, then work on the fix, document it so it is easy to understand for other developers and users, then build the package to test it. After you have tested it, you can easily propose the change to be included in the current Ubuntu development release. A developer with upload rights will review it for you and then get it integrated into Ubuntu."
4783
1209
msgstr ""
4784
1210
4785
1211
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:112
4786
1212
# fa9b32a2c49847f7b576db0fbf94036c
4787
1213
msgid "When trying to find a solution it is usually a good idea to check with Upstream and see if the problem (or a possible solution) is known already and, if not, do your best to make the solution a concerted effort."
4788
1214
msgstr ""
4789
1215
4790
1216
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:116
4791
1217
# 471fe59800924fc88bb010d19ea956f0
4792
1218
msgid "Additional steps might involve getting the change backported to an older, still supported version of Ubuntu and forwarding it to Upstream."
4793
1219
msgstr ""
4794
1220
4795
1221
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:119
4796
1222
# f36cfc93f9314451b2f5756d1652f425
4797
1223
msgid "The most important requirements for success in Ubuntu development are: having a knack for \"making things work again,\" not being afraid to read documentation and ask questions, being a team player and enjoying some detective work."
4798
1224
msgstr ""
4799
1225
4800
1226
#: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:123
4801
1227
# 7d209126020141168c019c68053e2abd
4802
1228
msgid "Good places to ask your questions are ``ubuntu-motu@lists.ubuntu.com`` and ``#ubuntu-motu`` on ``irc.freenode.net``. You will easily find a lot of new friends and people with the same passion that you have: making the world a better place by making better Open Source software."
4803
1229
msgstr ""
4804
1230
4805
1231
#: ../ubuntu-packaging-guide/kde.rst:3
4806
1232
# 993a9c1aa71f4aadadde6a86b5ef2ed3
4807
1233
msgid "KDE Packaging"
4808
1234
msgstr ""
4809
1235
4810
1236
#: ../ubuntu-packaging-guide/kde.rst:5
4811
1237
# f8f58e55f37f4abcaa7264f5fdc83903
4812
1238
msgid "Packaging of KDE programmes in Ubuntu is managed by the Kubuntu and MOTU teams.  You can contact the Kubuntu team on the `Kubuntu mailing list`_ and ``#kubuntu-devel`` Freenode IRC channl.  More information about Kubuntu development is on the `Kubuntu wiki page`_."
4813
1239
msgstr ""
4814
1240
4815
1241
#: ../ubuntu-packaging-guide/kde.rst:10
4816
1242
# dc2e9c6e5402441f85737795e60858fc
4817
1243
msgid "Our packaging follows the practices of the ``Debian Qt/KDE Team`` and Debian KDE Extras Team.  Most of our packages are derived from the packaging of these Debian teams."
4818
1244
msgstr ""
4819
1245
4820
1246
#: ../ubuntu-packaging-guide/kde.rst:15
4821
1247
# a38db20adbbe4a7da13b3d8559127a47
4822
1248
msgid "Patching Policy"
4823
1249
msgstr ""
4824
1250
4825
1251
#: ../ubuntu-packaging-guide/kde.rst:17
4826
1252
# ac62cb4c0e664dd4b78c074e72f87171
4827
1253
msgid "Kubuntu does not add patches to KDE programmes unless they come from the upstream authors or submitted upstream with the expectation they will be merged soon or we have consulted the issue with the upstream authors."
4828
1254
msgstr ""
4829
1255
4830
1256
#: ../ubuntu-packaging-guide/kde.rst:22
4831
1257
# cb2134c6ba4346458b922470c90a372f
4832
1258
msgid "Kubuntu does not change the branding of packages except where upstream expects this (such as the top left logo of the Kickoff menu) or to simplify (such as removing splash screens)."
4833
1259
msgstr ""
4834
1260
4835
1261
#: ../ubuntu-packaging-guide/kde.rst:27
4836
1262
# d51900d276b44514b5d0c25d00914f01
4837
1263
msgid "debian/rules"
4838
1264
msgstr ""
4839
1265
4840
1266
#: ../ubuntu-packaging-guide/kde.rst:29
4841
1267
# 1311b27e75554f01874d2417d4a5b9bf
4842
1268
msgid "Debian packages include some additions to the basic Debhelper usage. These are kept in the ``pkg-kde-tools`` package."
4843
1269
msgstr ""
4844
1270
4845
1271
#: ../ubuntu-packaging-guide/kde.rst:32
4846
1272
# 4bb8cca6f7f940dc84f4ea1798287277
4847
1273
msgid "Packages which use Debhelper 7 should add the ``--with=kde`` option. This will ensure the correct build flags are used and add options such as handling kdeinit stubs and translations::"
4848
1274
msgstr ""
4849
1275
4850
1276
#: ../ubuntu-packaging-guide/kde.rst:39
4851
1277
# 4a5e3298265c4fd4a8df97acde2c69f0
4852
1278
msgid "Some newer KDE packages use the ``dhmk`` system, an alternative to ``dh`` made by the Debian Qt/KDE team.  You can read about it in /usr/share/pkg-kde-tools/qt-kde-team/2/README.  Packages using this will ``include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk`` instead of running ``dh``."
4853
1279
msgstr ""
4854
1280
4855
1281
#: ../ubuntu-packaging-guide/kde.rst:47
4856
1282
# 15bc35a1eefa4bee8ed9330f9a044380
4857
1283
msgid "Translations"
4858
1284
msgstr ""
4859
1285
4860
1286
#: ../ubuntu-packaging-guide/kde.rst:49
4861
1287
# ffae416394ec437c93e62703e46d4c93
4862
1288
msgid "Packages in main have their translations imported into Launchpad and exported from Launchpad into Ubuntu's language-packs."
4863
1289
msgstr ""
4864
1290
4865
1291
#: ../ubuntu-packaging-guide/kde.rst:52
4866
1292
# e2265cab7d764b4b83529d3b24129102
4867
1293
msgid "So any KDE package in main must generate translation templates, include or make available upstream translations and handle ``.desktop`` file translations."
4868
1294
msgstr ""
4869
1295
4870
1296
#: ../ubuntu-packaging-guide/kde.rst:56
4871
1297
# 98fc332176d84794aafa13b935d98523
4872
1298
msgid "To generate translation templates the package must include a ``Messages.sh`` file; complain to the upstream if it does not.  You can check it works by running ``extract-messages.sh`` which should produce one or more ``.pot`` files in ``po/``.  This will be done automatically during build if you use the ``--with=kde`` option to ``dh``."
4873
1299
msgstr ""
4874
1300
4875
1301
#: ../ubuntu-packaging-guide/kde.rst:63
4876
1302
# 931ea74ab2164fe8a5a982500456cbb2
4877
1303
msgid "Upstream will usually have also put the translation ``.po`` files into the ``po/`` directory.  If they do not, check if they are in separate upstream language packs such as the KDE SC language packs.  If they are in separate language packs Launchpad will need to associate these together manually, contact `dpm`_ to do this."
4878
1304
msgstr ""
4879
1305
4880
1306
#: ../ubuntu-packaging-guide/kde.rst:69
4881
1307
# 52573e8867ac4ed2840f572b9facbcb9
4882
1308
msgid "If a package is moved from universe to main it will need to be reuploaded before the translations get imported into Launchpad."
4883
1309
msgstr ""
4884
1310
4885
1311
#: ../ubuntu-packaging-guide/kde.rst:72
4886
1312
# 198ae177145b49b285220a56326dd9ce
4887
1313
msgid "``.desktop`` files also need translations.  We patch KDELibs to read translations out of ``.po`` files which are pointed to by a line ``X-Ubuntu-Gettext-Domain=`` added to ``.desktop`` files at package build time.  A .pot file for each package is be generated at build time and .po files need to be downloaded from upstream and included in the package or in our language packs.  The list of .po files to be downloaded from KDE's repositories is in ``/usr/lib/kubuntu-desktop-i18n/desktop-template-list``."
4888
1314
msgstr ""
4889
1315
4890
1316
#: ../ubuntu-packaging-guide/kde.rst:82
4891
1317
# b49c7bc8627b48a7b4931ebd99bb725d
4892
1318
msgid "Library Symbols"
4893
1319
msgstr ""
4894
1320
4895
1321
#: ../ubuntu-packaging-guide/kde.rst:84
4896
1322
# a20fa5bcd911465789f7e4c2dfd61207
4897
1323
msgid "Library symbols are tracked in ``.symbols`` files to ensure none go missing for new releases.  KDE uses C++ libraries which act a little differently compared to C libraries.  Debian's Qt/KDE Team have scripts to handle this. See `Working with symbols files`_ for how to create and keep these files up to date."
4898
1324
msgstr ""
4899
1325
4900
1326
#: ../ubuntu-packaging-guide/libraries.rst:3
4901
1327
# 1161adad2b574c3dae7242a0e177d3cb
4902
1328
msgid "Shared Libraries"
4903
1329
msgstr ""
4904
1330
4905
1331
#: ../ubuntu-packaging-guide/libraries.rst:5
4906
1332
# e5417138b06748e7b459aee1467052f7
4907
1333
msgid "Shared libraries are compiled code which is intended to be shared among several different programmes.  They are distributed as ``.so`` files in ``/usr/lib/``."
4908
1334
msgstr ""
4909
1335
4910
1336
#: ../ubuntu-packaging-guide/libraries.rst:9
4911
1337
# 3ea2eb4efb504f41812aad3d3a3630c0
4912
1338
msgid "A library exports symbols which are the compiled versions of functions, classes and variables.  A library has a name called an SONAME which includes a version number.  This SONAME version does not necessarily match the public release version number.  A programme gets compiled against a given SONAME version of the library.  If any of the symbols is removed or changes then the version number needs to be changed which forces any packages using that library to be recompiled against the new version.  Version numbers are usually set by upstream and we follow them in our binary package names called an ABI number, but sometimes upstreams do not use sensible version numbers and packagers have to keep separate version numbers."
4913
1339
msgstr ""
4914
1340
4915
1341
#: ../ubuntu-packaging-guide/libraries.rst:21
4916
1342
# 07915fe981c94c4db90837dba30d3cc0
4917
1343
msgid "Libraries are usually distributed by upstream as standalone releases. Sometimes they are distributed as part of a programme.  In this case they can be included in the binary package along with the programme (this is called bundling) if you do not expect any other programmes to use the library, more often they should be split out into separate binary packages."
4918
1344
msgstr ""
4919
1345
4920
1346
#: ../ubuntu-packaging-guide/libraries.rst:27
4921
1347
# 4c5c66ef19a44914bee41dc0539099fa
4922
1348
msgid "The libraries themselves are put into a binary package named ``libfoo1`` where ``foo`` is the name of the library and ``1`` is the version from the SONAME. Development files from the package, such as header files, needed to compile programmes against the library are put into a package called ``libfoo-dev``."
4923
1349
msgstr ""
4924
1350
4925
1351
#: ../ubuntu-packaging-guide/libraries.rst:34
4926
1352
# 06a1e94fcbba4e9eadba9eb114a9c642
4927
1353
msgid "An Example"
4928
1354
msgstr ""
4929
1355
4930
1356
#: ../ubuntu-packaging-guide/libraries.rst:36
4931
1357
# a1ec3bc9d692403ab82b43da77562aae
4932
1358
msgid "We will use libnova as an example::"
4933
1359
msgstr ""
4934
1360
4935
1361
#: ../ubuntu-packaging-guide/libraries.rst:41
4936
1362
# cd3c9fa86411468aaf013cfabc0fdb33
4937
1363
msgid "To find the SONAME of the library run"
4938
1364
msgstr ""
4939
1365
4940
1366
#: ../ubuntu-packaging-guide/libraries.rst:43
4941
1367
# 0af012c44f39480b8014cfa20b67b08f
4942
1368
msgid "$ readelf -a /usr/lib/libnova-0.12.so.2 | grep SONAME"
4943
1369
msgstr ""
4944
1370
4945
1371
#: ../ubuntu-packaging-guide/libraries.rst:45
4946
1372
# 379239ed35f840b1b788703c94ef817f
4947
1373
msgid "The SONAME is ``libnova-0.12.so.2``, which matches the file name (usually the case but not always). Here upstream has put the upstream version number as part of the SONAME and given it an ABI version of ``2``.  Library package names should follow the SONAME of the library they contain. The library binary package is called ``libnova-0.12-2`` where ``libnova-0.12`` is the name of the library and ``2`` is our ABI number."
4948
1374
msgstr ""
4949
1375
4950
1376
#: ../ubuntu-packaging-guide/libraries.rst:52
4951
1377
# 122c0516404646858c5e64bbaf93311e
4952
1378
msgid "If upstream makes incompatible changes to their library they will have to reversion their SONAME and we will have to rename our library.  Any other packages using our library package will need to recompiled against the new version, this is called a transition and can take some effort. Hopefully our ABI number will continue to match upstream's SONAME but sometimes they introduce incompatibilities without changing their version number and we will need to change ours."
4953
1379
msgstr ""
4954
1380
4955
1381
#: ../ubuntu-packaging-guide/libraries.rst:60
4956
1382
# 5bb0db11faef4045a6ffa4ff6a360ada
4957
1383
msgid "Looking in debian/libnova-0.12-2.install we see it includes two files::"
4958
1384
msgstr ""
4959
1385
4960
1386
#: ../ubuntu-packaging-guide/libraries.rst:65
4961
1387
# e694ef09fee449688473a2417d7e4de3
4962
1388
msgid "The last one is the actual library, complete with minor and point version number.  The first one is a symlink which points to the actual library.  The symlink is what programmes using the library will look for, the running programmes do not care about the minor version number."
4963
1389
msgstr ""
4964
1390
4965
1391
#: ../ubuntu-packaging-guide/libraries.rst:70
4966
1392
# 4806076bc944430598072095813eaf39
4967
1393
msgid "``libnova-dev.install`` includes all the files needed to compile a programme with this library.  Header files, a config binary, the ``.la`` libtool file and ``libnova.so`` which is another symlink pointing at the library, programmes compiling against the library do not care about the major version number (although the binary they compile into will)."
4968
1394
msgstr ""
4969
1395
4970
1396
#: ../ubuntu-packaging-guide/libraries.rst:76
4971
1397
# 4d4773c47d50413e9e4c9f1163445e3c
4972
1398
msgid "``.la`` libtool files are needed on some non-Linux systems with poor library support but usually cause more problems than they solve on Debian systems.  It is a current `Debian goal to remove .la files`_ and we should help with this."
4973
1399
msgstr ""
4974
1400
4975
1401
#: ../ubuntu-packaging-guide/libraries.rst:82
4976
1402
# 4cffd2fb14c64c8abca846161203f289
4977
1403
msgid "Static Libraries"
4978
1404
msgstr ""
4979
1405
4980
1406
#: ../ubuntu-packaging-guide/libraries.rst:84
4981
1407
# 6ccaf98902504122aa73d033cac53220
4982
1408
msgid "The -dev package also ships ``usr/lib/libnova.a``.  This is a static library, an alternative to the shared library.  Any programme compiled against the static library will include the code directory into itself.  This gets round worrying about binary compatibility of the library.  However it also means that any bugs, including security issues, will not be updated along with the libary until the programme is recompiled.  For this reason programmes using static libraries are discouraged."
4983
1409
msgstr ""
4984
1410
4985
1411
#: ../ubuntu-packaging-guide/libraries.rst:94
4986
1412
# 398bf230fe85495fb24337ec903082d5
4987
1413
msgid "Symbol Files"
4988
1414
msgstr ""
4989
1415
4990
1416
#: ../ubuntu-packaging-guide/libraries.rst:96
4991
1417
# 870880e5a31c40b2a6c33ca619012e39
4992
1418
msgid "When a package builds against a library the ``shlibs`` mechanism will add a package dependency on that library.  This is why most programmes will have ``Depends: ${shlibs:Depends}`` in ``debian/control``.  That gets replaced with the library dependencies at build time.  However shlibs can only make it depend on the major ABI version number, ``2`` in our libnova example, so if new symbols get added in libnova 2.1 a programme using these symbols could still be installed against libnova ABI 2.0 which would then crash."
4993
1419
msgstr ""
4994
1420
4995
1421
#: ../ubuntu-packaging-guide/libraries.rst:104
4996
1422
# e6474afb8a8841ea8e5f50f6d3c97cdb
4997
1423
msgid "To make the library dependencies more precise we keep ``.symbols`` files that list all the symbols in a library and the version they appeared in."
4998
1424
msgstr ""
4999
1425
5000
1426
#: ../ubuntu-packaging-guide/libraries.rst:107
Reviewer	Review Type	Date Requested	Status
Daniel Holbach (community)		2012-03-16	Approve on 2012-03-20
Review via email: mp+97903@code.launchpad.net