Merge lp:~vorlon/gnome-user-docs/ubuntu-jaunty into lp:~ubuntu-core-doc/gnome-user-docs/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
Reviewer Review Type Date Requested Status
Matthew East (community) Approve
Review via email: mp+5028@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

uploading this to jaunty, so merging it into the official branch would be advantageous ;)

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
=== modified file 'debian/changelog'
--- debian/changelog 2009-03-27 22:37:01 +0000
+++ debian/changelog 2009-03-30 12:50:42 +0000
@@ -1,3 +1,13 @@
1gnome-user-docs (2.26.0+svn20090323ubuntu2) jaunty; urgency=low
2
3 * Fix Vcs-Bzr field to point at the current branch
4 * debian/control*, debian/rules, debian/gnome-user-guide.install:
5 build per-language packages with a dependency on a common
6 gnome-user-guide package, letting language packs pull in the
7 appropriate languages and saving space on the CDs.
8
9 -- Steve Langasek <vorlon@debian.org> Mon, 30 Mar 2009 05:50:00 -0700
10
1gnome-user-docs (2.26.0+svn20090323ubuntu1) jaunty; urgency=low11gnome-user-docs (2.26.0+svn20090323ubuntu1) jaunty; urgency=low
212
3 * Version 2.26.0 released13 * Version 2.26.0 released
414
=== modified file 'debian/control'
--- debian/control 2008-03-17 07:57:48 +0000
+++ debian/control 2009-03-30 12:45:35 +0000
@@ -6,14 +6,14 @@
6Standards-Version: 3.7.36Standards-Version: 3.7.3
7Pre-Depends: dpkg (>= 1.10.24)7Pre-Depends: dpkg (>= 1.10.24)
8Build-Depends: debhelper (>= 5),8Build-Depends: debhelper (>= 5),
9 cdbs,9 cdbs
10 fdupes
11Build-Depends-Indep: scrollkeeper,10Build-Depends-Indep: scrollkeeper,
12 gnome-doc-utils,11 gnome-doc-utils,
13 pkg-config,12 pkg-config,
14 gnome-common,13 gnome-common,
15 automake1.1014 automake1.10,
16XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-hardy15 iso-codes
16Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty
1717
18Package: gnome-user-guide18Package: gnome-user-guide
19Architecture: all19Architecture: all
@@ -26,3 +26,311 @@
26Description: GNOME user's guide26Description: GNOME user's guide
27 Documentation for using the GNOME 2 desktop environment and its components. 27 Documentation for using the GNOME 2 desktop environment and its components.
28 It covers usage and setup of the core GNOME 2 programs.28 It covers usage and setup of the core GNOME 2 programs.
29
30Package: gnome-user-guide-ar
31Architecture: all
32Depends: ${misc:Depends},
33 gnome-user-guide (= ${source:Version}),
34 scrollkeeper,
35 yelp
36Conflicts: gnome-intro
37Replaces: gnome2-user-guide
38Description: GNOME user's guide (Arabic)
39 Documentation for using the GNOME 2 desktop environment and its components.
40 It covers usage and setup of the core GNOME 2 programs.
41 .
42 This package includes translated documentation for Arabic.
43
44Package: gnome-user-guide-bg
45Architecture: all
46Depends: ${misc:Depends},
47 gnome-user-guide (= ${source:Version}),
48 scrollkeeper,
49 yelp
50Conflicts: gnome-intro
51Replaces: gnome2-user-guide
52Description: GNOME user's guide (Bulgarian)
53 Documentation for using the GNOME 2 desktop environment and its components.
54 It covers usage and setup of the core GNOME 2 programs.
55 .
56 This package includes translated documentation for Bulgarian.
57
58Package: gnome-user-guide-ca
59Architecture: all
60Depends: ${misc:Depends},
61 gnome-user-guide (= ${source:Version}),
62 scrollkeeper,
63 yelp
64Conflicts: gnome-intro
65Replaces: gnome2-user-guide
66Description: GNOME user's guide (Catalan)
67 Documentation for using the GNOME 2 desktop environment and its components.
68 It covers usage and setup of the core GNOME 2 programs.
69 .
70 This package includes translated documentation for Catalan.
71
72Package: gnome-user-guide-cs
73Architecture: all
74Depends: ${misc:Depends},
75 gnome-user-guide (= ${source:Version}),
76 scrollkeeper,
77 yelp
78Conflicts: gnome-intro
79Replaces: gnome2-user-guide
80Description: GNOME user's guide (Czech)
81 Documentation for using the GNOME 2 desktop environment and its components.
82 It covers usage and setup of the core GNOME 2 programs.
83 .
84 This package includes translated documentation for Czech.
85
86Package: gnome-user-guide-de
87Architecture: all
88Depends: ${misc:Depends},
89 gnome-user-guide (= ${source:Version}),
90 scrollkeeper,
91 yelp
92Conflicts: gnome-intro
93Replaces: gnome2-user-guide
94Description: GNOME user's guide (German)
95 Documentation for using the GNOME 2 desktop environment and its components.
96 It covers usage and setup of the core GNOME 2 programs.
97 .
98 This package includes translated documentation for German.
99
100Package: gnome-user-guide-el
101Architecture: all
102Depends: ${misc:Depends},
103 gnome-user-guide (= ${source:Version}),
104 scrollkeeper,
105 yelp
106Conflicts: gnome-intro
107Replaces: gnome2-user-guide
108Description: GNOME user's guide (Greek, Modern (1453-))
109 Documentation for using the GNOME 2 desktop environment and its components.
110 It covers usage and setup of the core GNOME 2 programs.
111 .
112 This package includes translated documentation for Greek, Modern (1453-).
113
114Package: gnome-user-guide-en
115Architecture: all
116Depends: ${misc:Depends},
117 gnome-user-guide (= ${source:Version}),
118 scrollkeeper,
119 yelp
120Conflicts: gnome-intro
121Replaces: gnome2-user-guide
122Description: GNOME user's guide (English)
123 Documentation for using the GNOME 2 desktop environment and its components.
124 It covers usage and setup of the core GNOME 2 programs.
125 .
126 This package includes translated documentation for English.
127
128Package: gnome-user-guide-es
129Architecture: all
130Depends: ${misc:Depends},
131 gnome-user-guide (= ${source:Version}),
132 scrollkeeper,
133 yelp
134Conflicts: gnome-intro
135Replaces: gnome2-user-guide
136Description: GNOME user's guide (Spanish)
137 Documentation for using the GNOME 2 desktop environment and its components.
138 It covers usage and setup of the core GNOME 2 programs.
139 .
140 This package includes translated documentation for Spanish.
141
142Package: gnome-user-guide-eu
143Architecture: all
144Depends: ${misc:Depends},
145 gnome-user-guide (= ${source:Version}),
146 scrollkeeper,
147 yelp
148Conflicts: gnome-intro
149Replaces: gnome2-user-guide
150Description: GNOME user's guide (Basque)
151 Documentation for using the GNOME 2 desktop environment and its components.
152 It covers usage and setup of the core GNOME 2 programs.
153 .
154 This package includes translated documentation for Basque.
155
156Package: gnome-user-guide-fi
157Architecture: all
158Depends: ${misc:Depends},
159 gnome-user-guide (= ${source:Version}),
160 scrollkeeper,
161 yelp
162Conflicts: gnome-intro
163Replaces: gnome2-user-guide
164Description: GNOME user's guide (Finnish)
165 Documentation for using the GNOME 2 desktop environment and its components.
166 It covers usage and setup of the core GNOME 2 programs.
167 .
168 This package includes translated documentation for Finnish.
169
170Package: gnome-user-guide-fr
171Architecture: all
172Depends: ${misc:Depends},
173 gnome-user-guide (= ${source:Version}),
174 scrollkeeper,
175 yelp
176Conflicts: gnome-intro
177Replaces: gnome2-user-guide
178Description: GNOME user's guide (French)
179 Documentation for using the GNOME 2 desktop environment and its components.
180 It covers usage and setup of the core GNOME 2 programs.
181 .
182 This package includes translated documentation for French.
183
184Package: gnome-user-guide-hu
185Architecture: all
186Depends: ${misc:Depends},
187 gnome-user-guide (= ${source:Version}),
188 scrollkeeper,
189 yelp
190Conflicts: gnome-intro
191Replaces: gnome2-user-guide
192Description: GNOME user's guide (Hungarian)
193 Documentation for using the GNOME 2 desktop environment and its components.
194 It covers usage and setup of the core GNOME 2 programs.
195 .
196 This package includes translated documentation for Hungarian.
197
198Package: gnome-user-guide-it
199Architecture: all
200Depends: ${misc:Depends},
201 gnome-user-guide (= ${source:Version}),
202 scrollkeeper,
203 yelp
204Conflicts: gnome-intro
205Replaces: gnome2-user-guide
206Description: GNOME user's guide (Italian)
207 Documentation for using the GNOME 2 desktop environment and its components.
208 It covers usage and setup of the core GNOME 2 programs.
209 .
210 This package includes translated documentation for Italian.
211
212Package: gnome-user-guide-ja
213Architecture: all
214Depends: ${misc:Depends},
215 gnome-user-guide (= ${source:Version}),
216 scrollkeeper,
217 yelp
218Conflicts: gnome-intro
219Replaces: gnome2-user-guide
220Description: GNOME user's guide (Japanese)
221 Documentation for using the GNOME 2 desktop environment and its components.
222 It covers usage and setup of the core GNOME 2 programs.
223 .
224 This package includes translated documentation for Japanese.
225
226Package: gnome-user-guide-ko
227Architecture: all
228Depends: ${misc:Depends},
229 gnome-user-guide (= ${source:Version}),
230 scrollkeeper,
231 yelp
232Conflicts: gnome-intro
233Replaces: gnome2-user-guide
234Description: GNOME user's guide (Korean)
235 Documentation for using the GNOME 2 desktop environment and its components.
236 It covers usage and setup of the core GNOME 2 programs.
237 .
238 This package includes translated documentation for Korean.
239
240Package: gnome-user-guide-oc
241Architecture: all
242Depends: ${misc:Depends},
243 gnome-user-guide (= ${source:Version}),
244 scrollkeeper,
245 yelp
246Conflicts: gnome-intro
247Replaces: gnome2-user-guide
248Description: GNOME user's guide (Occitan (post 1500))
249 Documentation for using the GNOME 2 desktop environment and its components.
250 It covers usage and setup of the core GNOME 2 programs.
251 .
252 This package includes translated documentation for Occitan (post 1500).
253
254Package: gnome-user-guide-pa
255Architecture: all
256Depends: ${misc:Depends},
257 gnome-user-guide (= ${source:Version}),
258 scrollkeeper,
259 yelp
260Conflicts: gnome-intro
261Replaces: gnome2-user-guide
262Description: GNOME user's guide (Panjabi)
263 Documentation for using the GNOME 2 desktop environment and its components.
264 It covers usage and setup of the core GNOME 2 programs.
265 .
266 This package includes translated documentation for Panjabi.
267
268Package: gnome-user-guide-pt
269Architecture: all
270Depends: ${misc:Depends},
271 gnome-user-guide (= ${source:Version}),
272 scrollkeeper,
273 yelp
274Conflicts: gnome-intro
275Replaces: gnome2-user-guide
276Description: GNOME user's guide (Portuguese)
277 Documentation for using the GNOME 2 desktop environment and its components.
278 It covers usage and setup of the core GNOME 2 programs.
279 .
280 This package includes translated documentation for Portuguese.
281
282Package: gnome-user-guide-ru
283Architecture: all
284Depends: ${misc:Depends},
285 gnome-user-guide (= ${source:Version}),
286 scrollkeeper,
287 yelp
288Conflicts: gnome-intro
289Replaces: gnome2-user-guide
290Description: GNOME user's guide (Russian)
291 Documentation for using the GNOME 2 desktop environment and its components.
292 It covers usage and setup of the core GNOME 2 programs.
293 .
294 This package includes translated documentation for Russian.
295
296Package: gnome-user-guide-sv
297Architecture: all
298Depends: ${misc:Depends},
299 gnome-user-guide (= ${source:Version}),
300 scrollkeeper,
301 yelp
302Conflicts: gnome-intro
303Replaces: gnome2-user-guide
304Description: GNOME user's guide (Swedish)
305 Documentation for using the GNOME 2 desktop environment and its components.
306 It covers usage and setup of the core GNOME 2 programs.
307 .
308 This package includes translated documentation for Swedish.
309
310Package: gnome-user-guide-th
311Architecture: all
312Depends: ${misc:Depends},
313 gnome-user-guide (= ${source:Version}),
314 scrollkeeper,
315 yelp
316Conflicts: gnome-intro
317Replaces: gnome2-user-guide
318Description: GNOME user's guide (Thai)
319 Documentation for using the GNOME 2 desktop environment and its components.
320 It covers usage and setup of the core GNOME 2 programs.
321 .
322 This package includes translated documentation for Thai.
323
324Package: gnome-user-guide-zh
325Architecture: all
326Depends: ${misc:Depends},
327 gnome-user-guide (= ${source:Version}),
328 scrollkeeper,
329 yelp
330Conflicts: gnome-intro
331Replaces: gnome2-user-guide
332Description: GNOME user's guide (Chinese)
333 Documentation for using the GNOME 2 desktop environment and its components.
334 It covers usage and setup of the core GNOME 2 programs.
335 .
336 This package includes translated documentation for Chinese.
29337
=== added file 'debian/control.in'
--- debian/control.in 1970-01-01 00:00:00 +0000
+++ debian/control.in 2009-03-30 12:45:35 +0000
@@ -0,0 +1,28 @@
1Source: gnome-user-docs
2Section: gnome
3Priority: optional
4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
5XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org>
6Standards-Version: 3.7.3
7Pre-Depends: dpkg (>= 1.10.24)
8Build-Depends: debhelper (>= 5),
9 cdbs
10Build-Depends-Indep: scrollkeeper,
11 gnome-doc-utils,
12 pkg-config,
13 gnome-common,
14 automake1.10,
15 iso-codes
16Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty
17
18Package: gnome-user-guide
19Architecture: all
20Depends: ${misc:Depends},
21 scrollkeeper,
22 yelp
23Provides: gnome2-user-guide
24Conflicts: gnome-intro
25Replaces: gnome2-user-guide
26Description: GNOME user's guide
27 Documentation for using the GNOME 2 desktop environment and its components.
28 It covers usage and setup of the core GNOME 2 programs.
029
=== added file 'debian/control.lang'
--- debian/control.lang 1970-01-01 00:00:00 +0000
+++ debian/control.lang 2009-03-30 11:32:11 +0000
@@ -0,0 +1,14 @@
1
2Package: gnome-user-guide-${ll}
3Architecture: all
4Depends: ${misc:Depends},
5 gnome-user-guide (= ${source:Version}),
6 scrollkeeper,
7 yelp
8Conflicts: gnome-intro
9Replaces: gnome2-user-guide
10Description: GNOME user's guide (${lang})
11 Documentation for using the GNOME 2 desktop environment and its components.
12 It covers usage and setup of the core GNOME 2 programs.
13 .
14 This package includes translated documentation for ${lang}.
015
=== added file 'debian/gnome-user-guide.install'
--- debian/gnome-user-guide.install 1970-01-01 00:00:00 +0000
+++ debian/gnome-user-guide.install 2009-03-30 12:43:01 +0000
@@ -0,0 +1,1 @@
1/usr/share/gnome/help/*/C
02
=== modified file 'debian/rules'
--- debian/rules 2008-09-25 08:09:34 +0000
+++ debian/rules 2009-03-30 12:37:33 +0000
@@ -6,6 +6,7 @@
66
7DEB_DH_BUILDDEB_ARGS := -- -Zbzip27DEB_DH_BUILDDEB_ARGS := -- -Zbzip2
8DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper8DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
9DEB_DH_INSTALL_SOURCEDIR = debian/tmp
910
10makebuilddir/gnome-user-guide::11makebuilddir/gnome-user-guide::
11 @gnome-autogen.sh --prefix=/usr --disable-scrollkeeper12 @gnome-autogen.sh --prefix=/usr --disable-scrollkeeper
@@ -20,14 +21,27 @@
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)"
21 @echo "---"22 @echo "---"
22 rm -f debian/gnome-user-guide.links23 rm -f debian/gnome-user-guide.links
24 rm -f debian/gnome-user-guide-*.install
2325
24binary-post-install/gnome-user-guide::26binary-post-install/gnome-user-guide::
25 rm -rf debian/gnome-user-guide/var/lib/scrollkeeper27 rm -rf debian/gnome-user-guide/var/lib/scrollkeeper
2628
27binary-fixup/gnome-user-guide::29# This rule will fail if one language code is a prefix of another!
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
29 set -- $$(echo $$s | tr ' ' '\n' | sort); \31# fail if there are no matches.
30 f=$$1; shift; \32common-install-indep::
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); \
32 done > $(CURDIR)/debian/gnome-user-guide.links34 do echo $$ll; done | sed -e's/_.*//' | sort -u); \
33 dh_link -pgnome-user-guide35 do \
36 echo /usr/share/gnome/help/'*'/$${lang}* > debian/gnome-user-guide-$${lang}.install; \
37 done
38
39debian/control::
40 (cat debian/control.in; \
41 for lang in $$(for ll in $$(sed -n -e's/^DOC_LINGUAS[[:space:]]*=[[:space:]]*//p' gnome2-*-guide/Makefile.am); \
42 do echo $$ll; done | sed -e's/_.*//' | sort -u); \
43 do \
44 name=$$(sed -n -e"/^#/d; s/;.*//; /\([[:space:]]\|^\)$$lang[[:space:]]/p" /usr/share/iso-codes/iso_639.tab |cut -f4-); \
45 sed -e"s/\$${ll}/$$lang/; s/\$${lang}/$$name/;" debian/control.lang; \
46 done) > debian/control.new
47 mv debian/control.new debian/control

Subscribers

People subscribed via source and target branches