Merge lp:~vorlon/gnome-user-docs/ubuntu-jaunty into lp:~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty
- ubuntu-jaunty
- Merge into ubuntu-jaunty
Proposed by
Steve Langasek
Status: | Merged |
---|---|
Merged at revision: | 742 |
Proposed branch: | lp:~vorlon/gnome-user-docs/ubuntu-jaunty |
Merge into: | lp:~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~vorlon/gnome-user-docs/ubuntu-jaunty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthew East (community) | Approve | ||
Review via email: mp+5028@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote : | # |
Revision history for this message
Matthew East (mdke) wrote : | # |
Thanks Steve for this.
review:
Approve
- 742. By Matthew East
-
Merging from ~vorlon's branch, already uploaded to Ubuntu/Jaunty
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2009-03-27 22:37:01 +0000 |
3 | +++ debian/changelog 2009-03-30 12:50:42 +0000 |
4 | @@ -1,3 +1,13 @@ |
5 | +gnome-user-docs (2.26.0+svn20090323ubuntu2) jaunty; urgency=low |
6 | + |
7 | + * Fix Vcs-Bzr field to point at the current branch |
8 | + * debian/control*, debian/rules, debian/gnome-user-guide.install: |
9 | + build per-language packages with a dependency on a common |
10 | + gnome-user-guide package, letting language packs pull in the |
11 | + appropriate languages and saving space on the CDs. |
12 | + |
13 | + -- Steve Langasek <vorlon@debian.org> Mon, 30 Mar 2009 05:50:00 -0700 |
14 | + |
15 | gnome-user-docs (2.26.0+svn20090323ubuntu1) jaunty; urgency=low |
16 | |
17 | * Version 2.26.0 released |
18 | |
19 | === modified file 'debian/control' |
20 | --- debian/control 2008-03-17 07:57:48 +0000 |
21 | +++ debian/control 2009-03-30 12:45:35 +0000 |
22 | @@ -6,14 +6,14 @@ |
23 | Standards-Version: 3.7.3 |
24 | Pre-Depends: dpkg (>= 1.10.24) |
25 | Build-Depends: debhelper (>= 5), |
26 | - cdbs, |
27 | - fdupes |
28 | + cdbs |
29 | Build-Depends-Indep: scrollkeeper, |
30 | gnome-doc-utils, |
31 | pkg-config, |
32 | gnome-common, |
33 | - automake1.10 |
34 | -XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-hardy |
35 | + automake1.10, |
36 | + iso-codes |
37 | +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty |
38 | |
39 | Package: gnome-user-guide |
40 | Architecture: all |
41 | @@ -26,3 +26,311 @@ |
42 | Description: GNOME user's guide |
43 | Documentation for using the GNOME 2 desktop environment and its components. |
44 | It covers usage and setup of the core GNOME 2 programs. |
45 | + |
46 | +Package: gnome-user-guide-ar |
47 | +Architecture: all |
48 | +Depends: ${misc:Depends}, |
49 | + gnome-user-guide (= ${source:Version}), |
50 | + scrollkeeper, |
51 | + yelp |
52 | +Conflicts: gnome-intro |
53 | +Replaces: gnome2-user-guide |
54 | +Description: GNOME user's guide (Arabic) |
55 | + Documentation for using the GNOME 2 desktop environment and its components. |
56 | + It covers usage and setup of the core GNOME 2 programs. |
57 | + . |
58 | + This package includes translated documentation for Arabic. |
59 | + |
60 | +Package: gnome-user-guide-bg |
61 | +Architecture: all |
62 | +Depends: ${misc:Depends}, |
63 | + gnome-user-guide (= ${source:Version}), |
64 | + scrollkeeper, |
65 | + yelp |
66 | +Conflicts: gnome-intro |
67 | +Replaces: gnome2-user-guide |
68 | +Description: GNOME user's guide (Bulgarian) |
69 | + Documentation for using the GNOME 2 desktop environment and its components. |
70 | + It covers usage and setup of the core GNOME 2 programs. |
71 | + . |
72 | + This package includes translated documentation for Bulgarian. |
73 | + |
74 | +Package: gnome-user-guide-ca |
75 | +Architecture: all |
76 | +Depends: ${misc:Depends}, |
77 | + gnome-user-guide (= ${source:Version}), |
78 | + scrollkeeper, |
79 | + yelp |
80 | +Conflicts: gnome-intro |
81 | +Replaces: gnome2-user-guide |
82 | +Description: GNOME user's guide (Catalan) |
83 | + Documentation for using the GNOME 2 desktop environment and its components. |
84 | + It covers usage and setup of the core GNOME 2 programs. |
85 | + . |
86 | + This package includes translated documentation for Catalan. |
87 | + |
88 | +Package: gnome-user-guide-cs |
89 | +Architecture: all |
90 | +Depends: ${misc:Depends}, |
91 | + gnome-user-guide (= ${source:Version}), |
92 | + scrollkeeper, |
93 | + yelp |
94 | +Conflicts: gnome-intro |
95 | +Replaces: gnome2-user-guide |
96 | +Description: GNOME user's guide (Czech) |
97 | + Documentation for using the GNOME 2 desktop environment and its components. |
98 | + It covers usage and setup of the core GNOME 2 programs. |
99 | + . |
100 | + This package includes translated documentation for Czech. |
101 | + |
102 | +Package: gnome-user-guide-de |
103 | +Architecture: all |
104 | +Depends: ${misc:Depends}, |
105 | + gnome-user-guide (= ${source:Version}), |
106 | + scrollkeeper, |
107 | + yelp |
108 | +Conflicts: gnome-intro |
109 | +Replaces: gnome2-user-guide |
110 | +Description: GNOME user's guide (German) |
111 | + Documentation for using the GNOME 2 desktop environment and its components. |
112 | + It covers usage and setup of the core GNOME 2 programs. |
113 | + . |
114 | + This package includes translated documentation for German. |
115 | + |
116 | +Package: gnome-user-guide-el |
117 | +Architecture: all |
118 | +Depends: ${misc:Depends}, |
119 | + gnome-user-guide (= ${source:Version}), |
120 | + scrollkeeper, |
121 | + yelp |
122 | +Conflicts: gnome-intro |
123 | +Replaces: gnome2-user-guide |
124 | +Description: GNOME user's guide (Greek, Modern (1453-)) |
125 | + Documentation for using the GNOME 2 desktop environment and its components. |
126 | + It covers usage and setup of the core GNOME 2 programs. |
127 | + . |
128 | + This package includes translated documentation for Greek, Modern (1453-). |
129 | + |
130 | +Package: gnome-user-guide-en |
131 | +Architecture: all |
132 | +Depends: ${misc:Depends}, |
133 | + gnome-user-guide (= ${source:Version}), |
134 | + scrollkeeper, |
135 | + yelp |
136 | +Conflicts: gnome-intro |
137 | +Replaces: gnome2-user-guide |
138 | +Description: GNOME user's guide (English) |
139 | + Documentation for using the GNOME 2 desktop environment and its components. |
140 | + It covers usage and setup of the core GNOME 2 programs. |
141 | + . |
142 | + This package includes translated documentation for English. |
143 | + |
144 | +Package: gnome-user-guide-es |
145 | +Architecture: all |
146 | +Depends: ${misc:Depends}, |
147 | + gnome-user-guide (= ${source:Version}), |
148 | + scrollkeeper, |
149 | + yelp |
150 | +Conflicts: gnome-intro |
151 | +Replaces: gnome2-user-guide |
152 | +Description: GNOME user's guide (Spanish) |
153 | + Documentation for using the GNOME 2 desktop environment and its components. |
154 | + It covers usage and setup of the core GNOME 2 programs. |
155 | + . |
156 | + This package includes translated documentation for Spanish. |
157 | + |
158 | +Package: gnome-user-guide-eu |
159 | +Architecture: all |
160 | +Depends: ${misc:Depends}, |
161 | + gnome-user-guide (= ${source:Version}), |
162 | + scrollkeeper, |
163 | + yelp |
164 | +Conflicts: gnome-intro |
165 | +Replaces: gnome2-user-guide |
166 | +Description: GNOME user's guide (Basque) |
167 | + Documentation for using the GNOME 2 desktop environment and its components. |
168 | + It covers usage and setup of the core GNOME 2 programs. |
169 | + . |
170 | + This package includes translated documentation for Basque. |
171 | + |
172 | +Package: gnome-user-guide-fi |
173 | +Architecture: all |
174 | +Depends: ${misc:Depends}, |
175 | + gnome-user-guide (= ${source:Version}), |
176 | + scrollkeeper, |
177 | + yelp |
178 | +Conflicts: gnome-intro |
179 | +Replaces: gnome2-user-guide |
180 | +Description: GNOME user's guide (Finnish) |
181 | + Documentation for using the GNOME 2 desktop environment and its components. |
182 | + It covers usage and setup of the core GNOME 2 programs. |
183 | + . |
184 | + This package includes translated documentation for Finnish. |
185 | + |
186 | +Package: gnome-user-guide-fr |
187 | +Architecture: all |
188 | +Depends: ${misc:Depends}, |
189 | + gnome-user-guide (= ${source:Version}), |
190 | + scrollkeeper, |
191 | + yelp |
192 | +Conflicts: gnome-intro |
193 | +Replaces: gnome2-user-guide |
194 | +Description: GNOME user's guide (French) |
195 | + Documentation for using the GNOME 2 desktop environment and its components. |
196 | + It covers usage and setup of the core GNOME 2 programs. |
197 | + . |
198 | + This package includes translated documentation for French. |
199 | + |
200 | +Package: gnome-user-guide-hu |
201 | +Architecture: all |
202 | +Depends: ${misc:Depends}, |
203 | + gnome-user-guide (= ${source:Version}), |
204 | + scrollkeeper, |
205 | + yelp |
206 | +Conflicts: gnome-intro |
207 | +Replaces: gnome2-user-guide |
208 | +Description: GNOME user's guide (Hungarian) |
209 | + Documentation for using the GNOME 2 desktop environment and its components. |
210 | + It covers usage and setup of the core GNOME 2 programs. |
211 | + . |
212 | + This package includes translated documentation for Hungarian. |
213 | + |
214 | +Package: gnome-user-guide-it |
215 | +Architecture: all |
216 | +Depends: ${misc:Depends}, |
217 | + gnome-user-guide (= ${source:Version}), |
218 | + scrollkeeper, |
219 | + yelp |
220 | +Conflicts: gnome-intro |
221 | +Replaces: gnome2-user-guide |
222 | +Description: GNOME user's guide (Italian) |
223 | + Documentation for using the GNOME 2 desktop environment and its components. |
224 | + It covers usage and setup of the core GNOME 2 programs. |
225 | + . |
226 | + This package includes translated documentation for Italian. |
227 | + |
228 | +Package: gnome-user-guide-ja |
229 | +Architecture: all |
230 | +Depends: ${misc:Depends}, |
231 | + gnome-user-guide (= ${source:Version}), |
232 | + scrollkeeper, |
233 | + yelp |
234 | +Conflicts: gnome-intro |
235 | +Replaces: gnome2-user-guide |
236 | +Description: GNOME user's guide (Japanese) |
237 | + Documentation for using the GNOME 2 desktop environment and its components. |
238 | + It covers usage and setup of the core GNOME 2 programs. |
239 | + . |
240 | + This package includes translated documentation for Japanese. |
241 | + |
242 | +Package: gnome-user-guide-ko |
243 | +Architecture: all |
244 | +Depends: ${misc:Depends}, |
245 | + gnome-user-guide (= ${source:Version}), |
246 | + scrollkeeper, |
247 | + yelp |
248 | +Conflicts: gnome-intro |
249 | +Replaces: gnome2-user-guide |
250 | +Description: GNOME user's guide (Korean) |
251 | + Documentation for using the GNOME 2 desktop environment and its components. |
252 | + It covers usage and setup of the core GNOME 2 programs. |
253 | + . |
254 | + This package includes translated documentation for Korean. |
255 | + |
256 | +Package: gnome-user-guide-oc |
257 | +Architecture: all |
258 | +Depends: ${misc:Depends}, |
259 | + gnome-user-guide (= ${source:Version}), |
260 | + scrollkeeper, |
261 | + yelp |
262 | +Conflicts: gnome-intro |
263 | +Replaces: gnome2-user-guide |
264 | +Description: GNOME user's guide (Occitan (post 1500)) |
265 | + Documentation for using the GNOME 2 desktop environment and its components. |
266 | + It covers usage and setup of the core GNOME 2 programs. |
267 | + . |
268 | + This package includes translated documentation for Occitan (post 1500). |
269 | + |
270 | +Package: gnome-user-guide-pa |
271 | +Architecture: all |
272 | +Depends: ${misc:Depends}, |
273 | + gnome-user-guide (= ${source:Version}), |
274 | + scrollkeeper, |
275 | + yelp |
276 | +Conflicts: gnome-intro |
277 | +Replaces: gnome2-user-guide |
278 | +Description: GNOME user's guide (Panjabi) |
279 | + Documentation for using the GNOME 2 desktop environment and its components. |
280 | + It covers usage and setup of the core GNOME 2 programs. |
281 | + . |
282 | + This package includes translated documentation for Panjabi. |
283 | + |
284 | +Package: gnome-user-guide-pt |
285 | +Architecture: all |
286 | +Depends: ${misc:Depends}, |
287 | + gnome-user-guide (= ${source:Version}), |
288 | + scrollkeeper, |
289 | + yelp |
290 | +Conflicts: gnome-intro |
291 | +Replaces: gnome2-user-guide |
292 | +Description: GNOME user's guide (Portuguese) |
293 | + Documentation for using the GNOME 2 desktop environment and its components. |
294 | + It covers usage and setup of the core GNOME 2 programs. |
295 | + . |
296 | + This package includes translated documentation for Portuguese. |
297 | + |
298 | +Package: gnome-user-guide-ru |
299 | +Architecture: all |
300 | +Depends: ${misc:Depends}, |
301 | + gnome-user-guide (= ${source:Version}), |
302 | + scrollkeeper, |
303 | + yelp |
304 | +Conflicts: gnome-intro |
305 | +Replaces: gnome2-user-guide |
306 | +Description: GNOME user's guide (Russian) |
307 | + Documentation for using the GNOME 2 desktop environment and its components. |
308 | + It covers usage and setup of the core GNOME 2 programs. |
309 | + . |
310 | + This package includes translated documentation for Russian. |
311 | + |
312 | +Package: gnome-user-guide-sv |
313 | +Architecture: all |
314 | +Depends: ${misc:Depends}, |
315 | + gnome-user-guide (= ${source:Version}), |
316 | + scrollkeeper, |
317 | + yelp |
318 | +Conflicts: gnome-intro |
319 | +Replaces: gnome2-user-guide |
320 | +Description: GNOME user's guide (Swedish) |
321 | + Documentation for using the GNOME 2 desktop environment and its components. |
322 | + It covers usage and setup of the core GNOME 2 programs. |
323 | + . |
324 | + This package includes translated documentation for Swedish. |
325 | + |
326 | +Package: gnome-user-guide-th |
327 | +Architecture: all |
328 | +Depends: ${misc:Depends}, |
329 | + gnome-user-guide (= ${source:Version}), |
330 | + scrollkeeper, |
331 | + yelp |
332 | +Conflicts: gnome-intro |
333 | +Replaces: gnome2-user-guide |
334 | +Description: GNOME user's guide (Thai) |
335 | + Documentation for using the GNOME 2 desktop environment and its components. |
336 | + It covers usage and setup of the core GNOME 2 programs. |
337 | + . |
338 | + This package includes translated documentation for Thai. |
339 | + |
340 | +Package: gnome-user-guide-zh |
341 | +Architecture: all |
342 | +Depends: ${misc:Depends}, |
343 | + gnome-user-guide (= ${source:Version}), |
344 | + scrollkeeper, |
345 | + yelp |
346 | +Conflicts: gnome-intro |
347 | +Replaces: gnome2-user-guide |
348 | +Description: GNOME user's guide (Chinese) |
349 | + Documentation for using the GNOME 2 desktop environment and its components. |
350 | + It covers usage and setup of the core GNOME 2 programs. |
351 | + . |
352 | + This package includes translated documentation for Chinese. |
353 | |
354 | === added file 'debian/control.in' |
355 | --- debian/control.in 1970-01-01 00:00:00 +0000 |
356 | +++ debian/control.in 2009-03-30 12:45:35 +0000 |
357 | @@ -0,0 +1,28 @@ |
358 | +Source: gnome-user-docs |
359 | +Section: gnome |
360 | +Priority: optional |
361 | +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
362 | +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org> |
363 | +Standards-Version: 3.7.3 |
364 | +Pre-Depends: dpkg (>= 1.10.24) |
365 | +Build-Depends: debhelper (>= 5), |
366 | + cdbs |
367 | +Build-Depends-Indep: scrollkeeper, |
368 | + gnome-doc-utils, |
369 | + pkg-config, |
370 | + gnome-common, |
371 | + automake1.10, |
372 | + iso-codes |
373 | +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty |
374 | + |
375 | +Package: gnome-user-guide |
376 | +Architecture: all |
377 | +Depends: ${misc:Depends}, |
378 | + scrollkeeper, |
379 | + yelp |
380 | +Provides: gnome2-user-guide |
381 | +Conflicts: gnome-intro |
382 | +Replaces: gnome2-user-guide |
383 | +Description: GNOME user's guide |
384 | + Documentation for using the GNOME 2 desktop environment and its components. |
385 | + It covers usage and setup of the core GNOME 2 programs. |
386 | |
387 | === added file 'debian/control.lang' |
388 | --- debian/control.lang 1970-01-01 00:00:00 +0000 |
389 | +++ debian/control.lang 2009-03-30 11:32:11 +0000 |
390 | @@ -0,0 +1,14 @@ |
391 | + |
392 | +Package: gnome-user-guide-${ll} |
393 | +Architecture: all |
394 | +Depends: ${misc:Depends}, |
395 | + gnome-user-guide (= ${source:Version}), |
396 | + scrollkeeper, |
397 | + yelp |
398 | +Conflicts: gnome-intro |
399 | +Replaces: gnome2-user-guide |
400 | +Description: GNOME user's guide (${lang}) |
401 | + Documentation for using the GNOME 2 desktop environment and its components. |
402 | + It covers usage and setup of the core GNOME 2 programs. |
403 | + . |
404 | + This package includes translated documentation for ${lang}. |
405 | |
406 | === added file 'debian/gnome-user-guide.install' |
407 | --- debian/gnome-user-guide.install 1970-01-01 00:00:00 +0000 |
408 | +++ debian/gnome-user-guide.install 2009-03-30 12:43:01 +0000 |
409 | @@ -0,0 +1,1 @@ |
410 | +/usr/share/gnome/help/*/C |
411 | |
412 | === modified file 'debian/rules' |
413 | --- debian/rules 2008-09-25 08:09:34 +0000 |
414 | +++ debian/rules 2009-03-30 12:37:33 +0000 |
415 | @@ -6,6 +6,7 @@ |
416 | |
417 | DEB_DH_BUILDDEB_ARGS := -- -Zbzip2 |
418 | DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper |
419 | +DEB_DH_INSTALL_SOURCEDIR = debian/tmp |
420 | |
421 | makebuilddir/gnome-user-guide:: |
422 | @gnome-autogen.sh --prefix=/usr --disable-scrollkeeper |
423 | @@ -20,14 +21,27 @@ |
424 | @echo "Version should start with: `grep AC_INIT configure.in | cut -d'[' -f3 | cut -d']' -f1`+svn`head -n1 ChangeLog | cut -d' ' -f1 | sed s'/\-//g'` (add 'ubuntu<n>' as necessary)" |
425 | @echo "---" |
426 | rm -f debian/gnome-user-guide.links |
427 | + rm -f debian/gnome-user-guide-*.install |
428 | |
429 | binary-post-install/gnome-user-guide:: |
430 | rm -rf debian/gnome-user-guide/var/lib/scrollkeeper |
431 | |
432 | -binary-fixup/gnome-user-guide:: |
433 | - unset LANG LC_ALL; cd debian/gnome-user-guide && fdupes -r1nq usr | while read s; do \ |
434 | - set -- $$(echo $$s | tr ' ' '\n' | sort); \ |
435 | - f=$$1; shift; \ |
436 | - for d; do echo $$f $$d; done; \ |
437 | - done > $(CURDIR)/debian/gnome-user-guide.links |
438 | - dh_link -pgnome-user-guide |
439 | +# This rule will fail if one language code is a prefix of another! |
440 | +# But we can't just add a match for ${lang}_*, because dh_install will |
441 | +# fail if there are no matches. |
442 | +common-install-indep:: |
443 | + for lang in $$(for ll in $$(sed -n -e's/^DOC_LINGUAS[[:space:]]*=[[:space:]]*//p' gnome2-*-guide/Makefile.am); \ |
444 | + do echo $$ll; done | sed -e's/_.*//' | sort -u); \ |
445 | + do \ |
446 | + echo /usr/share/gnome/help/'*'/$${lang}* > debian/gnome-user-guide-$${lang}.install; \ |
447 | + done |
448 | + |
449 | +debian/control:: |
450 | + (cat debian/control.in; \ |
451 | + for lang in $$(for ll in $$(sed -n -e's/^DOC_LINGUAS[[:space:]]*=[[:space:]]*//p' gnome2-*-guide/Makefile.am); \ |
452 | + do echo $$ll; done | sed -e's/_.*//' | sort -u); \ |
453 | + do \ |
454 | + name=$$(sed -n -e"/^#/d; s/;.*//; /\([[:space:]]\|^\)$$lang[[:space:]]/p" /usr/share/iso-codes/iso_639.tab |cut -f4-); \ |
455 | + sed -e"s/\$${ll}/$$lang/; s/\$${lang}/$$name/;" debian/control.lang; \ |
456 | + done) > debian/control.new |
457 | + mv debian/control.new debian/control |
uploading this to jaunty, so merging it into the official branch would be advantageous ;)