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