Merge lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge into lp:ubuntu/trusty/gnome-packagekit
- Trusty (14.04)
- merge
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge |
Merge into: | lp:ubuntu/trusty/gnome-packagekit |
Diff against target: |
79390 lines (+20393/-14798) 134 files modified
ChangeLog (+1049/-243) INSTALL (+1/-1) Makefile.in (+52/-24) NEWS (+94/-41) aclocal.m4 (+148/-75) configure (+169/-88) configure.ac (+1/-1) data/Makefile.am (+5/-0) data/Makefile.in (+99/-42) data/gpk-application.appdata.xml (+26/-0) data/gpk-application.desktop.in (+2/-2) data/gpk-application.ui (+1/-1) data/gpk-update-viewer.appdata.xml (+23/-0) data/gpk-update-viewer.ui (+1/-0) data/icons/16x16/Makefile.in (+52/-24) data/icons/16x16/animations/Makefile.in (+46/-17) data/icons/16x16/categories/Makefile.in (+46/-17) data/icons/16x16/status/Makefile.in (+46/-17) data/icons/22x22/Makefile.in (+52/-24) data/icons/22x22/animations/Makefile.in (+46/-17) data/icons/22x22/categories/Makefile.in (+46/-17) data/icons/22x22/status/Makefile.in (+46/-17) data/icons/24x24/Makefile.in (+52/-24) data/icons/24x24/animations/Makefile.in (+46/-17) data/icons/24x24/categories/Makefile.in (+46/-17) data/icons/24x24/status/Makefile.in (+46/-17) data/icons/48x48/Makefile.in (+52/-24) data/icons/48x48/animations/Makefile.in (+46/-17) data/icons/48x48/categories/Makefile.in (+46/-17) data/icons/48x48/status/Makefile.in (+46/-17) data/icons/Makefile.am (+5/-3) data/icons/Makefile.in (+63/-32) data/icons/scalable/Makefile.in (+52/-24) data/icons/scalable/categories/Makefile.in (+46/-17) data/icons/scalable/status/Makefile.in (+46/-17) debian/changelog (+22/-0) debian/control (+4/-4) debian/gnome-packagekit.install (+1/-0) debian/rules (+2/-1) depcomp (+2/-1) docs/Makefile.in (+52/-24) docs/dbus/Makefile.in (+46/-17) help/Makefile.am (+1/-1) help/Makefile.in (+47/-18) help/pt_BR/index.docbook (+969/-0) help/pt_BR/legal.xml (+16/-0) help/pt_BR/pt_BR.po (+1560/-0) help/ru/index.docbook (+1025/-0) help/ru/legal.xml (+75/-0) help/ru/ru.po (+1440/-0) man/Makefile.in (+46/-17) po/as.po (+134/-130) po/be.po (+272/-268) po/ca.po (+230/-242) po/ca@valencia.po (+230/-242) po/cs.po (+271/-243) po/da.po (+136/-132) po/de.po (+138/-134) po/el.po (+124/-130) po/es.po (+135/-131) po/et.po (+28/-18) po/eu.po (+289/-283) po/fi.po (+276/-270) po/ga.po (+796/-722) po/gl.po (+236/-240) po/gu.po (+6/-4) po/he.po (+720/-604) po/hi.po (+195/-155) po/hu.po (+241/-245) po/id.po (+135/-131) po/it.po (+134/-131) po/ja.po (+155/-156) po/kn.po (+154/-193) po/ko.po (+298/-288) po/lt.po (+134/-131) po/lv.po (+277/-308) po/ml.po (+329/-550) po/mr.po (+156/-194) po/nb.po (+135/-131) po/or.po (+6/-4) po/pa.po (+136/-129) po/pl.po (+227/-241) po/pt.po (+274/-742) po/pt_BR.po (+238/-242) po/ru.po (+145/-134) po/sk.po (+267/-446) po/sl.po (+135/-132) po/sr.po (+136/-132) po/sr@latin.po (+136/-132) po/ta.po (+7/-5) po/te.po (+6/-4) po/tg.po (+1187/-1030) po/th.po (+235/-240) po/tr.po (+403/-350) po/uk.po (+271/-263) po/zh_HK.po (+632/-582) po/zh_TW.po (+634/-583) python/Makefile.in (+52/-24) python/packagekit/Makefile.in (+46/-17) src/Makefile.am (+1/-3) src/Makefile.in (+73/-49) src/egg-console-kit.c (+0/-1) src/egg-markdown.c (+0/-387) src/egg-string.c (+0/-219) src/egg-test.c (+0/-359) src/egg-test.h (+0/-48) src/gpk-animated-icon.c (+7/-7) src/gpk-application.c (+15/-7) src/gpk-common.c (+0/-159) src/gpk-common.h (+0/-1) src/gpk-dbus-service.c (+0/-2) src/gpk-dbus-task.c (+4/-132) src/gpk-dbus-task.h (+9/-0) src/gpk-dbus.c (+0/-29) src/gpk-desktop.c (+0/-1) src/gpk-distro-upgrade.c (+0/-1) src/gpk-enum.c (+0/-199) src/gpk-enum.h (+0/-1) src/gpk-error.c (+0/-27) src/gpk-gnome.c (+0/-1) src/gpk-install-catalog.c (+0/-1) src/gpk-install-local-file.c (+15/-1) src/gpk-install-mime-type.c (+0/-1) src/gpk-install-package-name.c (+0/-1) src/gpk-install-provide-file.c (+0/-1) src/gpk-language.c (+0/-60) src/gpk-log.c (+0/-1) src/gpk-modal-dialog.c (+1/-137) src/gpk-prefs.c (+0/-2) src/gpk-self-test.c (+768/-29) src/gpk-service-pack.c (+1/-3) src/gpk-task.c (+0/-93) src/gpk-task.h (+0/-1) src/gpk-update-viewer.c (+11/-2) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry | Pending | ||
Review via email: mp+202209@code.launchpad.net |
This proposal supersedes a proposal from 2013-12-21.
Commit message
Description of the change
Merge from debian
Drop update-notify changes in debian
To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Unmerged revisions
- 22. By Jackson Doak
-
Revert update-notifier transition change from debian
- 21. By Jackson Doak
-
Fix debian maintainers email
- 20. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Drop build dependency on obsoleted gtk-doc-utils and libapt-pkg-dev
- Raise version of the libglib2.0-dev build dependency
- Alternatively depend on aptdaemon's PackageKit compatibility layer
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2013-06-04 14:16:12 +0000 |
3 | +++ ChangeLog 2014-01-19 08:25:25 +0000 |
4 | @@ -1,28 +1,806 @@ |
5 | -commit 2eb2c5959aac93b49c0a52573f7923fc8224cb6e |
6 | -Author: Richard Hughes <richard@hughsie.com> |
7 | -Date: 2013-05-13 |
8 | - |
9 | - Release version 3.8.2 |
10 | - |
11 | -M NEWS |
12 | - |
13 | -commit d35446f21082b6a84cb93bd825000a013a04b032 |
14 | -Author: Kjartan Maraas <kmaraas@gnome.org> |
15 | -Date: 2013-05-13 |
16 | - |
17 | - Updated Norwegian bokmål translation |
18 | - |
19 | -M po/nb.po |
20 | - |
21 | -commit 31da7223089f027a8345ab654e5dd6af0f00fc22 |
22 | -Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
23 | -Date: 2013-05-13 |
24 | - |
25 | - l10n: Update Japanese translation |
26 | - |
27 | -M po/ja.po |
28 | - |
29 | -commit 5da3c353638edcaffffccae90ef3fcbbba58a31a |
30 | +commit dece5f2bb39cc45f069f97cf9d5ec0258eaca7e2 |
31 | +Author: Richard Hughes <richard@hughsie.com> |
32 | +Date: 2013-10-14 |
33 | + |
34 | + Release version 3.10.1 |
35 | + |
36 | +M NEWS |
37 | + |
38 | +commit 18fa364a57774c472834ab94f9f452aa86672e5f |
39 | +Author: Richard Hughes <richard@hughsie.com> |
40 | +Date: 2013-10-14 |
41 | + |
42 | + Add Copyright information to the AppData files |
43 | + |
44 | +M data/gpk-application.appdata.xml |
45 | +M data/gpk-update-viewer.appdata.xml |
46 | + |
47 | +commit a25b247f5884522ed76048e3c939ed71bec70a7a |
48 | +Author: Richard Hughes <richard@hughsie.com> |
49 | +Date: 2013-10-14 |
50 | + |
51 | + trivial: Fix make distcheck |
52 | + |
53 | +M data/icons/Makefile.am |
54 | + |
55 | +commit 557aa788558afc62614cc93ce31b7716e75a9b3e |
56 | +Author: Richard Hughes <richard@hughsie.com> |
57 | +Date: 2013-10-14 |
58 | + |
59 | + Use the new 16:9 AppData screenshots |
60 | + |
61 | +M data/gpk-application.appdata.xml |
62 | +M data/gpk-update-viewer.appdata.xml |
63 | + |
64 | +commit 4ba9bfa93aecf8320aab9a60b16fd3ad578afba4 |
65 | +Author: Carles Ferrando <carles.ferrando@gmail.com> |
66 | +Date: 2013-10-06 |
67 | + |
68 | + [l10n] Updated Catalan (Valencian) translation |
69 | + |
70 | +M po/ca@valencia.po |
71 | + |
72 | +commit 1ff269bb0660c28a4f16011e682318f02c244a46 |
73 | +Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
74 | +Date: 2013-10-03 |
75 | + |
76 | + Enabled Brazilian Portuguese translation for help files |
77 | + |
78 | +M help/Makefile.am |
79 | + |
80 | +commit 5b97d9b2bd6c4467d27470484493c6d945930b29 |
81 | +Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
82 | +Date: 2013-10-03 |
83 | + |
84 | + Added Brazilian Portuguese translation for help files |
85 | + |
86 | +A help/pt_BR/figures/gpk-added-deps.png |
87 | +A help/pt_BR/figures/gpk-application-groups.png |
88 | +A help/pt_BR/figures/gpk-log.png |
89 | +A help/pt_BR/figures/gpk-prefs.png |
90 | +A help/pt_BR/figures/gpk-repo.png |
91 | +A help/pt_BR/figures/gpk-updates-overview.png |
92 | +A help/pt_BR/figures/gpk-updates.png |
93 | +A help/pt_BR/pt_BR.po |
94 | + |
95 | +commit 1926a8b48584761bda7abe52c00d417f4431209b |
96 | +Author: Мирослав Николић <miroslavnikolic@rocketmail.com> |
97 | +Date: 2013-10-01 |
98 | + |
99 | + Updated Serbian translation |
100 | + |
101 | +M po/sr.po |
102 | +M po/sr@latin.po |
103 | + |
104 | +commit a9b6fcfb7f658b253f6eec470ee4902a9364820f |
105 | +Author: Cheng-Chia Tseng <pswo10680@gmail.com> |
106 | +Date: 2013-09-30 |
107 | + |
108 | + Updated Traditional Chinese translation(Hong Kong and Taiwan) |
109 | + |
110 | +M po/zh_HK.po |
111 | +M po/zh_TW.po |
112 | + |
113 | +commit 84b93bb941b71c32b54c606668246d80f65ac81e |
114 | +Author: Muhammet Kara <muhammetk@gmail.com> |
115 | +Date: 2013-09-28 |
116 | + |
117 | + [l10n]Updated Turkish translation |
118 | + |
119 | +M po/tr.po |
120 | + |
121 | +commit f721a99e2d71573bf45b41682d3c5781b7180ff6 |
122 | +Author: Muhammet Kara <muhammetk@gmail.com> |
123 | +Date: 2013-09-28 |
124 | + |
125 | + [l10n]Updated Turkish translation |
126 | + |
127 | +M po/tr.po |
128 | + |
129 | +commit a5a58e7ab917f61347a613985ba2c7b2dd50eadb |
130 | +Author: Gianvito Cavasoli <gianvito@gmx.it> |
131 | +Date: 2013-09-25 |
132 | + |
133 | + [l10n] Updated Italian translation. |
134 | + |
135 | +M po/it.po |
136 | + |
137 | +commit 3fa53df94d17597bf333abc27dc08cb9c462d7a4 |
138 | +Author: Kjartan Maraas <kmaraas@gnome.org> |
139 | +Date: 2013-09-24 |
140 | + |
141 | + Updated Norwegian bokmål translation |
142 | + |
143 | +M po/nb.po |
144 | + |
145 | +commit edb974e1cd3b9132118c8ac85dae0bbff4e5291b |
146 | +Author: Marek Černocký <marek@manet.cz> |
147 | +Date: 2013-09-24 |
148 | + |
149 | + Updated Czech translation |
150 | + |
151 | +M po/cs.po |
152 | + |
153 | +commit a10ec9f9f5201d31797db65bd09c0311aeb07562 |
154 | +Author: Richard Hughes <richard@hughsie.com> |
155 | +Date: 2013-09-24 |
156 | + |
157 | + trivial: Post release version bump |
158 | + |
159 | +M RELEASE |
160 | +M configure.ac |
161 | + |
162 | +commit 2421005dcdb66dfab102689d10fa1a68816e66a2 |
163 | +Author: Richard Hughes <richard@hughsie.com> |
164 | +Date: 2013-09-24 |
165 | + |
166 | + Release version 3.10.0 |
167 | + |
168 | +M NEWS |
169 | +M RELEASE |
170 | +M configure.ac |
171 | + |
172 | +commit b2c8c061b9df7d8fe8abe7dbe94f841df2b901cc |
173 | +Author: Dmitriy S. Seregin <dseregin@59.ru> |
174 | +Date: 2013-09-22 |
175 | + |
176 | + Updated Russian translation |
177 | + |
178 | +M po/ru.po |
179 | + |
180 | +commit 605e3281cf30355cd4b2b59729eff9255c64b991 |
181 | +Author: Daniel Korostil <ted.korostiled@gmail.com> |
182 | +Date: 2013-09-21 |
183 | + |
184 | + Updated Ukrainian |
185 | + |
186 | +M po/uk.po |
187 | + |
188 | +commit 3d33ff0f9d11d4a1d0e238c3e86ba62c6d7f47e7 |
189 | +Author: Daniel Korostil <ted.korostiled@gmail.com> |
190 | +Date: 2013-09-21 |
191 | + |
192 | + Updated Ukrainian |
193 | + |
194 | +M po/uk.po |
195 | + |
196 | +commit 879b4721b4f34e7dc20873c93324bc8bd299d9b7 |
197 | +Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
198 | +Date: 2013-09-20 |
199 | + |
200 | + l10n: Update Japanese translation |
201 | + |
202 | +M po/ja.po |
203 | + |
204 | +commit 96e06f05adbb4b3a18959d18a7e744975a52882a |
205 | +Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> |
206 | +Date: 2013-09-20 |
207 | + |
208 | + Updated Traditional Chinese translation(Hong Kong and Taiwan) |
209 | + |
210 | +M po/zh_HK.po |
211 | +M po/zh_TW.po |
212 | + |
213 | +commit 69fa295015c551981e6eeac85002c81837c410e1 |
214 | +Author: Seán de Búrca <leftmostcat@gmail.com> |
215 | +Date: 2013-09-19 |
216 | + |
217 | + Updated Irish translation |
218 | + |
219 | +M po/ga.po |
220 | + |
221 | +commit 435e5da058530e693a242e17f65ab1603b7bb4c1 |
222 | +Author: António Lima <amrlima@gmail.com> |
223 | +Date: 2013-09-18 |
224 | + |
225 | + Updated Portuguese translation |
226 | + |
227 | +M po/pt.po |
228 | + |
229 | +commit c3168d01ef954fe75bf0d392339036bc658f1f10 |
230 | +Author: Josep Sànchez <papapep@gmx.com> |
231 | +Date: 2013-09-18 |
232 | + |
233 | + [l10n] Update Catalan translation |
234 | + |
235 | +M po/ca.po |
236 | + |
237 | +commit 262362a4e309e9adc5dcdd78269acbef5fc37ace |
238 | +Author: Akom Chotiphantawanon <knight2000@gmail.com> |
239 | +Date: 2013-09-18 |
240 | + |
241 | + Updated Thai translation. |
242 | + |
243 | +M po/th.po |
244 | + |
245 | +commit cfa9b243dc231f73785ee95b141110b12090e379 |
246 | +Author: A S Alam <apreet.alam@gmail.com> |
247 | +Date: 2013-09-17 |
248 | + |
249 | + Punjabi Translation updated by Aman |
250 | + |
251 | +M po/pa.po |
252 | + |
253 | +commit 75c8f55e5f521f14921bedc54dd0e56021707115 |
254 | +Author: Inaki Larranaga Murgoitio <dooteo@zundan.com> |
255 | +Date: 2013-09-17 |
256 | + |
257 | + Updated Basque language |
258 | + |
259 | +M po/eu.po |
260 | + |
261 | +commit 639f41e5c9a38ba0f4008b15d1e8c02b0db1475c |
262 | +Author: Ville-Pekka Vainio <vpvainio@iki.fi> |
263 | +Date: 2013-09-14 |
264 | + |
265 | + Finnish translation update by Jiri Grönroos |
266 | + |
267 | +M po/fi.po |
268 | + |
269 | +commit 7b3a1ee0b42324929163a02eff1d139cf768678b |
270 | +Author: Kris Thomsen <lakristho@gmail.com> |
271 | +Date: 2013-09-14 |
272 | + |
273 | + Updated Danish translation |
274 | + |
275 | +M po/da.po |
276 | + |
277 | +commit 7cef476238f177deb85bef212667c9ea0f20de1f |
278 | +Author: Pavol Klačanský <pavol@klacansky.com> |
279 | +Date: 2013-09-14 |
280 | + |
281 | + Updated slovak translation |
282 | + |
283 | +M po/sk.po |
284 | + |
285 | +commit d760c60493ad79285d65910f0351d45d05f10fda |
286 | +Author: Changwoo Ryu <cwryu@debian.org> |
287 | +Date: 2013-09-14 |
288 | + |
289 | + Updated Korean translation |
290 | + |
291 | +M po/ko.po |
292 | + |
293 | +commit 372b853a7930636ad496e16481333a2decadc2b6 |
294 | +Author: Kris Thomsen <lakristho@gmail.com> |
295 | +Date: 2013-09-13 |
296 | + |
297 | + Updated Danish translation |
298 | + |
299 | +M po/da.po |
300 | + |
301 | +commit 4d4310174845f1aba125aa1178fa0dac047d0b37 |
302 | +Author: Benjamin Steinwender <b@stbe.at> |
303 | +Date: 2013-09-13 |
304 | + |
305 | + Updated German translation |
306 | + |
307 | +M po/de.po |
308 | + |
309 | +commit 0fe8160e7dca0fe106aa0bd4f1926d9872a66603 |
310 | +Author: Richard Hughes <richard@hughsie.com> |
311 | +Date: 2013-09-13 |
312 | + |
313 | + Release version 3.9.92 |
314 | + |
315 | +M NEWS |
316 | +M RELEASE |
317 | +M configure.ac |
318 | + |
319 | +commit f59f57d4b6624f5c3f7aade55087beb294371963 |
320 | +Author: Gabor Kelemen <kelemeng@gnome.hu> |
321 | +Date: 2013-09-13 |
322 | + |
323 | + Updated Hungarian translation |
324 | + |
325 | +M po/hu.po |
326 | + |
327 | +commit e70f4ab8b2926bdaf3d2d1f774e25e995629cbcd |
328 | +Author: Enrico Nicoletto <liverig@gmail.com> |
329 | +Date: 2013-09-12 |
330 | + |
331 | + Updated Brazilian Portuguese translation |
332 | + |
333 | +M po/pt_BR.po |
334 | + |
335 | +commit b0987f02e09c0c3fefb8fa75f092e568d8b5afe5 |
336 | +Author: Aurimas Černius <aurisc4@gmail.com> |
337 | +Date: 2013-09-12 |
338 | + |
339 | + Updated Lithuanian translation |
340 | + |
341 | +M po/lt.po |
342 | + |
343 | +commit b939a910f901e76708b31e5b312ae0adbb6990a7 |
344 | +Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> |
345 | +Date: 2013-09-12 |
346 | + |
347 | + Updated Belarusian translation. |
348 | + |
349 | +M po/be.po |
350 | + |
351 | +commit 68c1e3f79300a12b8ddaf40e07cd78225e51ca86 |
352 | +Author: Victor Ibragimov <victor.ibragimov@gmail.com> |
353 | +Date: 2013-09-12 |
354 | + |
355 | + Tajik translation updated |
356 | + |
357 | +M po/tg.po |
358 | + |
359 | +commit 153d787523a5797cc97e8a3b59dfed226fa9e2e5 |
360 | +Author: Mattias Põldaru <mahfiaz@gmail.com> |
361 | +Date: 2013-09-12 |
362 | + |
363 | + [l10n] Updated Estonian translation |
364 | + |
365 | +M po/et.po |
366 | + |
367 | +commit 43ff917a724f7a568d7d8e1c0c540ee2f6391346 |
368 | +Author: Piotr Drąg <piotrdrag@gmail.com> |
369 | +Date: 2013-09-12 |
370 | + |
371 | + Updated Polish translation |
372 | + |
373 | +M po/pl.po |
374 | + |
375 | +commit 71feb5194d4f583c511a7f1f20d9985e41fb3097 |
376 | +Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org> |
377 | +Date: 2013-09-12 |
378 | + |
379 | + Updated Latvian translation |
380 | + |
381 | +M po/lv.po |
382 | + |
383 | +commit 7697bc47ab15517bf8b52e1b1479f1493bd3e261 |
384 | +Author: Fran Diéguez <fran.dieguez@mabishu.com> |
385 | +Date: 2013-09-11 |
386 | + |
387 | + Updated Galician translations |
388 | + |
389 | +M po/gl.po |
390 | + |
391 | +commit ce594582de727b51e7ff756f709e54af8e4133c8 |
392 | +Author: Matej Urbančič <mateju@svn.gnome.org> |
393 | +Date: 2013-09-11 |
394 | + |
395 | + Updated Slovenian translation |
396 | + |
397 | +M po/sl.po |
398 | + |
399 | +commit 1aac2d6a6d6c373208e56d9fef633bb141805abc |
400 | +Author: Daniel Mustieles <daniel.mustieles@gmail.com> |
401 | +Date: 2013-09-11 |
402 | + |
403 | + Updated Spanish translation |
404 | + |
405 | +M po/es.po |
406 | + |
407 | +commit 85f7bf866827a1642b73be066f939c9b010e092b |
408 | +Author: Nilamdyuti Goswami <ngoswami@redhat.com> |
409 | +Date: 2013-09-11 |
410 | + |
411 | + Assamese Translation Updated |
412 | + |
413 | +M po/as.po |
414 | + |
415 | +commit adf72ccdb1ce35fb10f3e2ecbbae7506f3316969 |
416 | +Author: Gianvito Cavasoli <gianvito@gmx.it> |
417 | +Date: 2013-09-11 |
418 | + |
419 | + [l10n] Updated Italian translation. |
420 | + |
421 | +M po/it.po |
422 | + |
423 | +commit f779f35efb0a91402798033c83f84a919a8baa11 |
424 | +Author: Andika Triwidada <andika@gmail.com> |
425 | +Date: 2013-09-11 |
426 | + |
427 | + Updated Indonesian translation |
428 | + |
429 | +M po/id.po |
430 | + |
431 | +commit 93459e9d69ff67d1c6112f4619a28bf352af1a99 |
432 | +Author: Marek Černocký <marek@manet.cz> |
433 | +Date: 2013-09-11 |
434 | + |
435 | + Updated Czech translation |
436 | + |
437 | +M po/cs.po |
438 | + |
439 | +commit e8419a96696cf6e3411ae660ed71bd6503c0747d |
440 | +Author: Richard Hughes <richard@hughsie.com> |
441 | +Date: 2013-09-11 |
442 | + |
443 | + Add two AppData files for gnome-software |
444 | + |
445 | +M data/Makefile.am |
446 | +A data/gpk-application.appdata.xml |
447 | +A data/gpk-update-viewer.appdata.xml |
448 | + |
449 | +commit 7da3b1ddadd180380928986d3b89789722c694e5 |
450 | +Author: Richard Hughes <richard@hughsie.com> |
451 | +Date: 2013-09-11 |
452 | + |
453 | + Change the name of the package installer from 'Software' to 'Packages' |
454 | + |
455 | + Now that GNOME Software exists, we don't want two things in the |
456 | + overview called 'Software'. |
457 | + |
458 | + String freeze exception acked by: |
459 | + |
460 | + 1/2 Piotr Drąg <piotrdrag@gmail.com> |
461 | + 2/2 Petr Kovar <pmkovar@gnome.org> |
462 | + |
463 | +M data/gpk-application.desktop.in |
464 | + |
465 | +commit 4387b732dd29773b8f6f835afc9e3f173b4f0158 |
466 | +Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> |
467 | +Date: 2013-09-08 |
468 | + |
469 | + Updated Belarusian translation. |
470 | + |
471 | +M po/be.po |
472 | + |
473 | +commit 3bde385eb9f85a08366ce3fee5c4831e5bd25b22 |
474 | +Author: Seán de Búrca <leftmostcat@gmail.com> |
475 | +Date: 2013-09-07 |
476 | + |
477 | + Updated Irish translation |
478 | + |
479 | +M po/ga.po |
480 | + |
481 | +commit 6d901dc36938e12f5eba4992dddd8739c57d3e06 |
482 | +Author: Мирослав Николић <miroslavnikolic@rocketmail.com> |
483 | +Date: 2013-09-05 |
484 | + |
485 | + Updated Serbian translation |
486 | + |
487 | +M po/sr.po |
488 | +M po/sr@latin.po |
489 | + |
490 | +commit 9dde8f0c5929bd4951ed85dfc10500a9d381aba4 |
491 | +Author: Elad Alfassa <elad@fedoraproject.org> |
492 | +Date: 2013-09-04 |
493 | + |
494 | + Add some desktop file categories |
495 | + |
496 | + We need the Settings category and the PackageManager category if |
497 | + we want |
498 | + gpk-application to appear in the right place in gnome-software |
499 | + |
500 | +M data/gpk-application.desktop.in |
501 | + |
502 | +commit b4443a6d97e26498e472c41dc46aa0521a3fa888 |
503 | +Author: Gianvito Cavasoli <gianvito@gmx.it> |
504 | +Date: 2013-09-04 |
505 | + |
506 | + [l10n] Updated Italian translation. |
507 | + |
508 | +M po/it.po |
509 | + |
510 | +commit 9663ac6b70bad5d9240d5d6893a0a68d246f142e |
511 | +Author: Timo Jyrinki <timo@debian.org> |
512 | +Date: 2013-09-04 |
513 | + |
514 | + Finnish translation update |
515 | + |
516 | +M po/fi.po |
517 | + |
518 | +commit 2a67640318c5adc406752c5b55bdb3f472c20550 |
519 | +Author: Seán de Búrca <leftmostcat@gmail.com> |
520 | +Date: 2013-09-02 |
521 | + |
522 | + Updated Irish translation |
523 | + |
524 | +M po/ga.po |
525 | + |
526 | +commit 2c2d0c9f7ee7272235cc082569ba82bc6c7d3f16 |
527 | +Author: Seán de Búrca <leftmostcat@gmail.com> |
528 | +Date: 2013-09-02 |
529 | + |
530 | + Updated Irish translation |
531 | + |
532 | +M po/ga.po |
533 | + |
534 | +commit 58e5e85b710583ac38d021e73014d544c542db6b |
535 | +Author: Aurimas Černius <aurisc4@gmail.com> |
536 | +Date: 2013-08-26 |
537 | + |
538 | + Updated Lithuanian translation |
539 | + |
540 | +M po/lt.po |
541 | + |
542 | +commit 19d66f0587d5a81fcf96ac27167a666ff8075b87 |
543 | +Author: Balázs Úr <urbalazs@src.gnome.org> |
544 | +Date: 2013-08-25 |
545 | + |
546 | + Updated Hungarian translation |
547 | + |
548 | +M po/hu.po |
549 | + |
550 | +commit aa17402adddb1b16eb1753a1c09687966b659098 |
551 | +Author: Piotr Drąg <piotrdrag@gmail.com> |
552 | +Date: 2013-08-24 |
553 | + |
554 | + Updated Polish translation |
555 | + |
556 | +M po/pl.po |
557 | + |
558 | +commit c17cf32f3ee05daaab180119dcae5aa0b7b95cca |
559 | +Author: Richard Hughes <richard@hughsie.com> |
560 | +Date: 2013-07-16 |
561 | + |
562 | + Do not use the deprecated gtk_icon_size_lookup_for_settings() |
563 | + |
564 | +M src/gpk-animated-icon.c |
565 | + |
566 | +commit 5c50d2a6fb6d565019388e231cd711d4aa8d1277 |
567 | +Author: Ignaker <ignaker@gmail.com> |
568 | +Date: 2013-08-22 |
569 | + |
570 | + Swapped "Required packages" and "Dependent packages" button |
571 | + functionality. |
572 | + |
573 | + Button's functionality were reversed. |
574 | + Swapped pk_client_get_requires_async with pk_client_get_depends_async |
575 | + function call. Added prototypes for callbacks that now are swapped |
576 | + too. |
577 | + |
578 | + https://bugzilla.gnome.org/show_bug.cgi?id=692629 |
579 | + |
580 | +M src/gpk-application.c |
581 | + |
582 | +commit d730a37552b0e8976a603cbef1bc7af36df3e2fc |
583 | +Author: Gil Forcada <gforcada@gnome.org> |
584 | +Date: 2013-08-18 |
585 | + |
586 | + [l10n] Update Catalan translation |
587 | + |
588 | +M po/ca.po |
589 | + |
590 | +commit e4f5932e9282bdbd0a2243c0037431267b2d2eaa |
591 | +Author: Marek Černocký <marek@manet.cz> |
592 | +Date: 2013-08-09 |
593 | + |
594 | + Updated Czech translation |
595 | + |
596 | +M po/cs.po |
597 | + |
598 | +commit 36e6fc329d85907fb6ce9926efe9711fe098c368 |
599 | +Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
600 | +Date: 2013-08-05 |
601 | + |
602 | + Updated Brazilian Portuguese translation |
603 | + |
604 | +M po/pt_BR.po |
605 | + |
606 | +commit a18820ad53868744c8935f2796a145d1a1f83972 |
607 | +Author: Yaron Shahrabani <sh.yaron@gmail.com> |
608 | +Date: 2013-07-31 |
609 | + |
610 | + Updated Hebrew translation. |
611 | + |
612 | +M po/he.po |
613 | + |
614 | +commit 0bf25c05171842b49864cbbe8e55eb2f5697159a |
615 | +Author: Matthias Klumpp <matthias@tenstral.net> |
616 | +Date: 2013-07-26 |
617 | + |
618 | + Don't pass relative file-paths to the session-service |
619 | + |
620 | + This is required if gpk-install-local-file is executed from the |
621 | + command- |
622 | + line using relative paths. |
623 | + (The session-service can never know the current working-directory, so |
624 | + only absolute paths are permitted) |
625 | + |
626 | +M src/gpk-install-local-file.c |
627 | + |
628 | +commit 18985ecda866cc85b4717efcc99500b97a0b34c2 |
629 | +Author: Victor Ibragimov <victor.ibragimov@gmail.com> |
630 | +Date: 2013-07-18 |
631 | + |
632 | + Tajik translation updated |
633 | + |
634 | +M po/tg.po |
635 | + |
636 | +commit 0f0bd0395a4ab1efcb25f5a8d974d59a7e795912 |
637 | +Author: Victor Ibragimov <victor.ibragimov@gmail.com> |
638 | +Date: 2013-07-18 |
639 | + |
640 | + Tajik translation updated |
641 | + |
642 | +M po/tg.po |
643 | + |
644 | +commit 960c2d4c3947152eef2d52cb39e3556253fc693b |
645 | +Author: Victor Ibragimov <victor.ibragimov@gmail.com> |
646 | +Date: 2013-07-17 |
647 | + |
648 | + Tajik translation updated |
649 | + |
650 | +M po/tg.po |
651 | + |
652 | +commit 6b5c175742108c36e43627032649035b5377eb0f |
653 | +Author: Gary Ching-Pang Lin <chingpang@gmail.com> |
654 | +Date: 2011-12-21 |
655 | + |
656 | + Set the default height of the details expander |
657 | + |
658 | + This commit sets a reasonable height for the details expander, so |
659 | + that the user can read the description easily. |
660 | + |
661 | + https://bugzilla.gnome.org/show_bug.cgi?id=666635 |
662 | + |
663 | +M data/gpk-update-viewer.ui |
664 | + |
665 | +commit 08ea37a2e74fdfa4497d24c16460f187186d5063 |
666 | +Author: Michael Catanzaro <mike.catanzaro@gmail.com> |
667 | +Date: 2013-06-02 |
668 | + |
669 | + Use a reasonable default window size |
670 | + |
671 | + The insanely small previous default was probably from the days of |
672 | + low-res displays. Since gpk-application currently always opens |
673 | + with the default window size, you currently have to resize the |
674 | + window every single time you open it, which sucks. |
675 | + |
676 | + Nowadays gnome-shell handles low-res displays just fine. If you're |
677 | + using an 800x600 resolution, this change causes the application |
678 | + to open |
679 | + maximized (which is desirable for very small screens). |
680 | + |
681 | + We additionally ought to remember our current size in gsettings when |
682 | + we quit, but that does not excuse a poor default. |
683 | + |
684 | + https://bugzilla.gnome.org/show_bug.cgi?id=701464 |
685 | + |
686 | +M src/gpk-application.c |
687 | + |
688 | +commit 2ef4d641eaf2e725ca07ca128cda636727118e0e |
689 | +Author: Michael Catanzaro <mike.catanzaro@gmail.com> |
690 | +Date: 2013-06-01 |
691 | + |
692 | + Show a meaningful name in the about dialog |
693 | + |
694 | + Fix the property name so that the name actually displays |
695 | + |
696 | + https://bugzilla.gnome.org/show_bug.cgi?id=663692 |
697 | + |
698 | +M src/gpk-application.c |
699 | + |
700 | +commit fd048d0bb4207341ff017d3d4d0ff0b6e954068f |
701 | +Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
702 | +Date: 2013-07-15 |
703 | + |
704 | + l10n: Update Japanese translation |
705 | + |
706 | +M po/ja.po |
707 | + |
708 | +commit 4077ba3ea30354ef070d640a5af4b6a913e97f4b |
709 | +Author: Richard Hughes <richard@hughsie.com> |
710 | +Date: 2013-06-18 |
711 | + |
712 | + Ignore package progress updates when the transaction is being |
713 | + simulated |
714 | + |
715 | + PackageKit backends do not have to issue INFO_FINISHED when |
716 | + simulating, and most |
717 | + don't bother. As we didn't special-case simulation, we set up the |
718 | + activity |
719 | + spinner on the Package(INFO_UPDATING) event and do not cancel |
720 | + the signal. |
721 | + |
722 | + This leaves every row in the update viewer with a spinning cursor, |
723 | + which due to |
724 | + the way the code was structured lead to an O(n*n) exposion of updates |
725 | + to the |
726 | + cell renderers for each update. For a dozen or so updates it was |
727 | + not noticable, |
728 | + and nobody noticed the slight increase of CPU usage. |
729 | + |
730 | + Now that TeX Live has officially jumped the shark and has many |
731 | + hundreds of |
732 | + sub-packages, it's quite plausible to have *thousands* of small |
733 | + packages to |
734 | + update. This means that the O(n*n) bug stops being a minor increase |
735 | + in CPU and |
736 | + starts to use the CPU at 100% for many hours before completing. |
737 | + |
738 | + Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=969852 |
739 | + |
740 | +M src/gpk-update-viewer.c |
741 | + |
742 | +commit 5d755446ddd6daa9eebd8986d8f07f61e99741f7 |
743 | +Author: Richard Hughes <richard@hughsie.com> |
744 | +Date: 2013-06-18 |
745 | + |
746 | + trivial: Fix up a tiny memory leak when getting updates |
747 | + |
748 | +M src/gpk-update-viewer.c |
749 | + |
750 | +commit c26b6869c1aee628d57bf082c41e7bbe40870834 |
751 | +Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com> |
752 | +Date: 2013-06-05 |
753 | + |
754 | + Updated Marathi Translations |
755 | + |
756 | +M po/mr.po |
757 | + |
758 | +commit c4a3b2f0a7c7e411f15304bccfbedaea40a444b3 |
759 | +Author: Cheng-Chia Tseng <pswo10680@gmail.com> |
760 | +Date: 2013-06-04 |
761 | + |
762 | + Updated Traditional Chinese translation(Hong Kong and Taiwan) |
763 | + |
764 | +M po/zh_HK.po |
765 | +M po/zh_TW.po |
766 | + |
767 | +commit 571f02037b84edf6d99f54b144a73b2d814966e3 |
768 | +Author: Akom Chotiphantawanon <knight2000@gmail.com> |
769 | +Date: 2013-06-02 |
770 | + |
771 | + Updated Thai translation |
772 | + |
773 | +M po/th.po |
774 | + |
775 | +commit d1ac55ea8945160d2bc231199f30c617961b73ff |
776 | +Author: Fran Diéguez <fran.dieguez@mabishu.com> |
777 | +Date: 2013-05-31 |
778 | + |
779 | + Updated Galician translations |
780 | + |
781 | +M po/gl.po |
782 | + |
783 | +commit 4a5f08eb4fbde11a5595795cf7d8205e027edd22 |
784 | +Author: Victor Ibragimov <victor.ibragimov@gmail.com> |
785 | +Date: 2013-05-28 |
786 | + |
787 | + Tajik updated |
788 | + |
789 | +M po/tg.po |
790 | + |
791 | +commit 8b7a1fed5c4187a79d6b447fbb0934b7db887333 |
792 | +Author: Dušan Kazik <prescott66@gmail.com> |
793 | +Date: 2013-05-24 |
794 | + |
795 | + Updated slovak translation |
796 | + |
797 | +M po/sk.po |
798 | + |
799 | +commit b8169051a1cb0a339c4e1c2177e6145059328d26 |
800 | +Author: Yuri Myasoedov <omerta13@yandex.ru> |
801 | +Date: 2013-05-18 |
802 | + |
803 | + Updated Russian translation |
804 | + |
805 | +M help/Makefile.am |
806 | +A help/ru/ru.po |
807 | + |
808 | +commit 0d7aa0dc8ac6fde107d130f4f0184659f6ec2a06 |
809 | +Author: Kjartan Maraas <kmaraas@gnome.org> |
810 | +Date: 2013-05-16 |
811 | + |
812 | + Updated Norwegian bokmål translation |
813 | + |
814 | +M po/nb.po |
815 | + |
816 | +commit 6db44e544f27f501f791a8e95720a48125974d94 |
817 | +Author: Shankar Prasad <svenkate@redhat.com> |
818 | +Date: 2013-05-14 |
819 | + |
820 | + updated kn translations |
821 | + |
822 | +M po/kn.po |
823 | + |
824 | +commit e89c71fcde52f1c5588d0d4963d76896c9ece775 |
825 | +Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
826 | +Date: 2013-05-13 |
827 | + |
828 | + l10n: Update Japanese translation |
829 | + |
830 | +M po/ja.po |
831 | + |
832 | +commit ea7275aec81f92a70d7b75e50c67c46e987e3f1d |
833 | Author: Yuri Myasoedov <omerta13@yandex.ru> |
834 | Date: 2013-05-12 |
835 | |
836 | @@ -30,7 +808,7 @@ |
837 | |
838 | M po/ru.po |
839 | |
840 | -commit 37f41ccb795318174093c80b50e3b266bdab018e |
841 | +commit d6dc0015f06d3f891b300a4d1fa47ea0e3da7636 |
842 | Author: Ask H. Larsen <asklarsen@gmail.com> |
843 | Date: 2013-05-10 |
844 | |
845 | @@ -38,7 +816,7 @@ |
846 | |
847 | M po/da.po |
848 | |
849 | -commit 55f0fb075a23eedb4c48f723a8dc5281279bdc70 |
850 | +commit 8999b04108979918a8ce60af4f7cff85fd89f52a |
851 | Author: ManojKumar Giri <mgiri@redhat.com> |
852 | Date: 2013-05-09 |
853 | |
854 | @@ -46,7 +824,23 @@ |
855 | |
856 | M po/or.po |
857 | |
858 | -commit 6a8e6e0d71c9aa685c1a96dde8e46301f98bc6cc |
859 | +commit 7b8e5ea4b657a87f91c5daf956307e20c313a347 |
860 | +Author: Krishnababu Krothapalli <kkrothap@redhat.com> |
861 | +Date: 2013-05-09 |
862 | + |
863 | + Updated Telugu Translations |
864 | + |
865 | +M po/te.po |
866 | + |
867 | +commit 9e863ebb29613ed0250b901eae50d76c8831e05d |
868 | +Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
869 | +Date: 2013-05-08 |
870 | + |
871 | + l10n: Update Japanese translation |
872 | + |
873 | +M po/ja.po |
874 | + |
875 | +commit 316df494c1f3c5e89146239167697bf69be09239 |
876 | Author: Matthias Clasen <mclasen@redhat.com> |
877 | Date: 2013-05-07 |
878 | |
879 | @@ -60,7 +854,7 @@ |
880 | |
881 | M src/gpk-application.c |
882 | |
883 | -commit 9859fa946915562a389d0fff8aa96bb54a82ab9e |
884 | +commit bf5a8e78a5f99b737f284444397395c1b6b23bfe |
885 | Author: Richard Hughes <richard@hughsie.com> |
886 | Date: 2013-05-07 |
887 | |
888 | @@ -80,7 +874,60 @@ |
889 | R082 man/gpk-repo.sgml man/gpk-service-pack.sgml |
890 | M man/gpk-update-viewer.sgml |
891 | |
892 | -commit 7acda5c62c06259e8d3479819ebc7759c34e6182 |
893 | +commit 78e8442265b5b029383392d355fedf1cba86f748 |
894 | +Author: Matej Urbančič <mateju@svn.gnome.org> |
895 | +Date: 2013-05-02 |
896 | + |
897 | + Updated Slovenian translation |
898 | + |
899 | +M po/sl.po |
900 | + |
901 | +commit ef50fd85f5fb8a1f4dd4da451692ad62480e7c55 |
902 | +Author: Shantha kumar <shkumar@redhat.com> |
903 | +Date: 2013-04-26 |
904 | + |
905 | + Tamil Translation Updated |
906 | + |
907 | +M po/ta.po |
908 | + |
909 | +commit 0c504068c6135560f933a9246567889ffcc36592 |
910 | +Author: Anish A <aneesh.nl@gmail.com> |
911 | +Date: 2013-04-25 |
912 | + |
913 | + Updated Malayalam Translation |
914 | + |
915 | +M po/ml.po |
916 | + |
917 | +commit cf7fe24cb59faadef415d691228142a1ddd827a2 |
918 | +Author: Dimitris Spingos <dmtrs32@gmail.com> |
919 | +Date: 2013-04-25 |
920 | + |
921 | + Updated Greek translation |
922 | + |
923 | +M po/el.po |
924 | + |
925 | +commit 0eb7c6ceb8467c200df7496f74e133ea847362bc |
926 | +Author: Matthias Klumpp <matthias@tenstral.net> |
927 | +Date: 2013-04-24 |
928 | + |
929 | + Remove redundant calls to g_type_init() |
930 | + |
931 | + This removes some compiler warnings. |
932 | + |
933 | +M src/gpk-dbus-service.c |
934 | +M src/gpk-distro-upgrade.c |
935 | +M src/gpk-install-catalog.c |
936 | +M src/gpk-install-local-file.c |
937 | +M src/gpk-install-mime-type.c |
938 | +M src/gpk-install-package-name.c |
939 | +M src/gpk-install-provide-file.c |
940 | +M src/gpk-log.c |
941 | +M src/gpk-prefs.c |
942 | +M src/gpk-self-test.c |
943 | +M src/gpk-service-pack.c |
944 | +M src/gpk-update-viewer.c |
945 | + |
946 | +commit 7256ce3bb7d8da7de35e31fcb22c7b63e9650413 |
947 | Author: Matthias Klumpp <matthias@tenstral.net> |
948 | Date: 2013-04-24 |
949 | |
950 | @@ -93,47 +940,15 @@ |
951 | |
952 | M data/gpk-install-local-file.desktop.in |
953 | |
954 | -commit b39da213164bae4cfbb0c571eb5e7d9e3636b8cb |
955 | -Author: Krishnababu Krothapalli <kkrothap@redhat.com> |
956 | -Date: 2013-05-09 |
957 | - |
958 | - Updated Telugu Translations |
959 | - |
960 | -M po/te.po |
961 | - |
962 | -commit 94a505d34dc8a6178f17ea5894f511ccf2a08eae |
963 | -Author: Jiro Matsuzawa <jmatsuzawa@gnome.org> |
964 | -Date: 2013-05-08 |
965 | - |
966 | - l10n: Update Japanese translation |
967 | - |
968 | -M po/ja.po |
969 | - |
970 | -commit 53ab9136f39b879b7f98d3befedab63f1632b667 |
971 | -Author: Rajesh Ranjan <rranjan@redhat.com> |
972 | -Date: 2013-05-02 |
973 | - |
974 | - hindi update |
975 | - |
976 | -M po/hi.po |
977 | - |
978 | -commit 842660a233335507dd0cc7a47f8bc31baede4da5 |
979 | -Author: Shantha kumar <shkumar@redhat.com> |
980 | -Date: 2013-04-26 |
981 | - |
982 | - Tamil Translation Updated |
983 | - |
984 | -M po/ta.po |
985 | - |
986 | -commit 308cf654852391e6304721b99b4f4a12fcf17cf1 |
987 | -Author: Andika Triwidada <andika@gmail.com> |
988 | -Date: 2013-04-25 |
989 | - |
990 | - Updated Indonesian translation |
991 | - |
992 | -M po/id.po |
993 | - |
994 | -commit 59cd3649d2288f36269a0a9d9a6556622b114603 |
995 | +commit 386e3bed60d14418bbe833ecee43115cc3deb096 |
996 | +Author: Daniel Mustieles <daniel.mustieles@gmail.com> |
997 | +Date: 2013-04-22 |
998 | + |
999 | + Updated Spanish translation |
1000 | + |
1001 | +M po/es.po |
1002 | + |
1003 | +commit 5ef70385b65f5a0e990a38d1fd17c6e82db42a35 |
1004 | Author: Sweta Kothari <swkothar@redhat.com> |
1005 | Date: 2013-04-22 |
1006 | |
1007 | @@ -141,7 +956,7 @@ |
1008 | |
1009 | M po/gu.po |
1010 | |
1011 | -commit 7e655cc5d152a8b5fabc16c5a51db3d6f428c80b |
1012 | +commit ffde2d52378c5ffcc7c1e54b77d0bf0393f5d3e9 |
1013 | Author: Christian Kirbach <Christian.Kirbach@googlemail.com> |
1014 | Date: 2013-04-20 |
1015 | |
1016 | @@ -149,16 +964,7 @@ |
1017 | |
1018 | M po/de.po |
1019 | |
1020 | -commit ff4903f20dbb7a5693607f2fdb9bacc73402d82e |
1021 | -Author: Мирослав Николић <miroslavnikolic@rocketmail.com> |
1022 | -Date: 2013-04-20 |
1023 | - |
1024 | - Updated Serbian translation |
1025 | - |
1026 | -M po/sr.po |
1027 | -M po/sr@latin.po |
1028 | - |
1029 | -commit 70995acc725240fc5dd648c9ca744a2581a7d75b |
1030 | +commit 1595b60831c72b0d223fef76585d63eb272b2b89 |
1031 | Author: Wylmer Wang <wantinghard@gmail.com> |
1032 | Date: 2013-04-20 |
1033 | |
1034 | @@ -166,7 +972,7 @@ |
1035 | |
1036 | M po/zh_CN.po |
1037 | |
1038 | -commit a79040833d5fe0613b9ea035053e55401fa41964 |
1039 | +commit ae69fd49386bfa37544715d06174694bb4cbe710 |
1040 | Author: Gianvito Cavasoli <gianvito@gmx.it> |
1041 | Date: 2013-04-19 |
1042 | |
1043 | @@ -174,7 +980,7 @@ |
1044 | |
1045 | M po/it.po |
1046 | |
1047 | -commit b93012ed1445902616f9fdfd36388524e4f38ffd |
1048 | +commit 4db7215eee438c5510c92d649a15fbc55d00d9ab |
1049 | Author: Nilamdyuti Goswami <ngoswami@redhat.com> |
1050 | Date: 2013-04-18 |
1051 | |
1052 | @@ -182,15 +988,7 @@ |
1053 | |
1054 | M po/as.po |
1055 | |
1056 | -commit 3651ae4916522fdab358219c546346f0a5e04ca5 |
1057 | -Author: A S Alam <aalam@users.sf.net> |
1058 | -Date: 2013-04-17 |
1059 | - |
1060 | - update Punjabi Translation |
1061 | - |
1062 | -M po/pa.po |
1063 | - |
1064 | -commit cad0083b6cf26a61a370ec282ba71be5b5bf9fd8 |
1065 | +commit df37622f7f39f0bb8a45acad758408b1349c1647 |
1066 | Author: Matej Urbančič <mateju@svn.gnome.org> |
1067 | Date: 2013-04-16 |
1068 | |
1069 | @@ -198,7 +996,15 @@ |
1070 | |
1071 | M po/sl.po |
1072 | |
1073 | -commit cde511a7bf425d2927d692c96b44f48b88eae3f4 |
1074 | +commit 81ab2640ce60874eda9c6f6cc7c29b4ab4da2871 |
1075 | +Author: Sílvia Miranda <silvia@softcatala.cat> |
1076 | +Date: 2013-04-16 |
1077 | + |
1078 | + [l10n] Fix Catalan translation |
1079 | + |
1080 | +M po/ca.po |
1081 | + |
1082 | +commit c2bceadacb90c697306bdcf634e51433eb1e20a9 |
1083 | Author: Daniel Mustieles <daniel.mustieles@gmail.com> |
1084 | Date: 2013-04-16 |
1085 | |
1086 | @@ -206,34 +1012,93 @@ |
1087 | |
1088 | M po/es.po |
1089 | |
1090 | -commit 61227d139142e91c340f807c902364c14220d77e |
1091 | -Author: Aurimas Černius <aurisc4@gmail.com> |
1092 | -Date: 2013-04-15 |
1093 | - |
1094 | - Updated Lithuanian translation |
1095 | - |
1096 | -M po/lt.po |
1097 | - |
1098 | -commit d874acf1e06958bbe2672064323954d29663d52d |
1099 | -Author: Richard Hughes <richard@hughsie.com> |
1100 | -Date: 2013-04-15 |
1101 | - |
1102 | - trivial: Post release version bump |
1103 | - |
1104 | -M RELEASE |
1105 | -M configure.ac |
1106 | - |
1107 | -commit 99dba8439f99195caa7b0876369160aa687b469c |
1108 | -Author: Richard Hughes <richard@hughsie.com> |
1109 | -Date: 2013-04-15 |
1110 | - |
1111 | - Release version 3.8.1 |
1112 | - |
1113 | -M NEWS |
1114 | -M RELEASE |
1115 | -M configure.ac |
1116 | - |
1117 | -commit 2d3c08335fe9c3dcff9f41b5b27d02a4d7304a99 |
1118 | +commit 64012d1a81cd6eb0e98f654300277a5733bb4e8e |
1119 | +Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
1120 | +Date: 2013-04-14 |
1121 | + |
1122 | + Updated Brazilian Portuguese translation |
1123 | + |
1124 | +M po/pt_BR.po |
1125 | + |
1126 | +commit 013c068974b65fa90d7d7cefcd9f1add7e9869c7 |
1127 | +Author: Akom Chotiphantawanon <knight2000@gmail.com> |
1128 | +Date: 2013-04-14 |
1129 | + |
1130 | + Updated Thai translation |
1131 | + |
1132 | +M po/th.po |
1133 | + |
1134 | +commit a618a17a43396b984cd75881f6cb74f98ffc5016 |
1135 | +Author: Carles Ferrando <carles.ferrando@gmail.com> |
1136 | +Date: 2013-04-14 |
1137 | + |
1138 | + [l10n] Updated Catalan (Valencian) translation |
1139 | + |
1140 | +M po/ca@valencia.po |
1141 | + |
1142 | +commit a2632e5bba5beb96d4c0c27ae99001b96dc04f5b |
1143 | +Author: Gil Forcada <gforcada@gnome.org> |
1144 | +Date: 2013-04-14 |
1145 | + |
1146 | + [l10n] Update Catalan translation |
1147 | + |
1148 | +M po/ca.po |
1149 | + |
1150 | +commit be0eced211610203041663d9d320b2c13f17c56e |
1151 | +Author: Marek Černocký <marek@manet.cz> |
1152 | +Date: 2013-04-13 |
1153 | + |
1154 | + Updated Czech translation |
1155 | + |
1156 | +M po/cs.po |
1157 | + |
1158 | +commit 652849ce112c250f614265d3c3600239f060b9e0 |
1159 | +Author: Piotr Drąg <piotrdrag@gmail.com> |
1160 | +Date: 2013-04-13 |
1161 | + |
1162 | + Updated Polish translation |
1163 | + |
1164 | +M po/pl.po |
1165 | + |
1166 | +commit bd6145e165564a9dd3aa6efdef8a2c4ce40195b0 |
1167 | +Author: Matthias Clasen <mclasen@redhat.com> |
1168 | +Date: 2013-04-10 |
1169 | + |
1170 | + Fix a string |
1171 | + |
1172 | + No space before : |
1173 | + https://bugzilla.gnome.org/show_bug.cgi?id=695546 |
1174 | + |
1175 | + Signed-off-by: Richard Hughes <richard@hughsie.com> |
1176 | + |
1177 | +M src/gpk-modal-dialog.c |
1178 | + |
1179 | +commit ac6dca1984db855abd844062b30506cfed4dd8c7 |
1180 | +Author: Matthias Clasen <mclasen@redhat.com> |
1181 | +Date: 2013-04-10 |
1182 | + |
1183 | + Add some translator comments |
1184 | + |
1185 | + https://bugzilla.gnome.org/show_bug.cgi?id=687484 |
1186 | + |
1187 | + Signed-off-by: Richard Hughes <richard@hughsie.com> |
1188 | + |
1189 | +M src/gpk-common.c |
1190 | + |
1191 | +commit 5842cd16317fdf322699fa265b8e0e72682ff11d |
1192 | +Author: Matthias Clasen <mclasen@redhat.com> |
1193 | +Date: 2013-04-10 |
1194 | + |
1195 | + Fix a spelling |
1196 | + |
1197 | + The C locale uses US English. |
1198 | + https://bugzilla.gnome.org/show_bug.cgi?id=687484 |
1199 | + |
1200 | + Signed-off-by: Richard Hughes <richard@hughsie.com> |
1201 | + |
1202 | +M data/gpk-application.ui |
1203 | + |
1204 | +commit abdbaadc2632c86968581a43784b416569f155cb |
1205 | Author: Matthias Clasen <mclasen@redhat.com> |
1206 | Date: 2013-04-10 |
1207 | |
1208 | @@ -248,7 +1113,51 @@ |
1209 | |
1210 | M src/gpk-application.c |
1211 | |
1212 | -commit 28d2027b96716611d5138407c3771a307720da51 |
1213 | +commit 1976972530e9f4526d952a243978d3ea5a7cf00a |
1214 | +Author: Matthias Clasen <mclasen@redhat.com> |
1215 | +Date: 2013-04-10 |
1216 | + |
1217 | + Mark strings as translatable |
1218 | + |
1219 | + https://bugzilla.gnome.org/show_bug.cgi?id=692987 |
1220 | + |
1221 | + Signed-off-by: Richard Hughes <richard@hughsie.com> |
1222 | + |
1223 | +M data/gpk-application.ui |
1224 | + |
1225 | +commit 0eb8d01f5b2c8ada706702f61f189aaccf1849c5 |
1226 | +Author: Richard Hughes <richard@hughsie.com> |
1227 | +Date: 2013-04-11 |
1228 | + |
1229 | + Port from a homegrown EggTest to GTest |
1230 | + |
1231 | +M src/.gitignore |
1232 | +M src/Makefile.am |
1233 | +M src/egg-console-kit.c |
1234 | +M src/egg-markdown.c |
1235 | +M src/egg-string.c |
1236 | +D src/egg-test.c |
1237 | +D src/egg-test.h |
1238 | +M src/gpk-animated-icon.c |
1239 | +M src/gpk-application.c |
1240 | +M src/gpk-common.c |
1241 | +M src/gpk-common.h |
1242 | +M src/gpk-dbus-service.c |
1243 | +M src/gpk-dbus-task.c |
1244 | +M src/gpk-dbus-task.h |
1245 | +M src/gpk-dbus.c |
1246 | +M src/gpk-desktop.c |
1247 | +M src/gpk-enum.c |
1248 | +M src/gpk-enum.h |
1249 | +M src/gpk-error.c |
1250 | +M src/gpk-gnome.c |
1251 | +M src/gpk-language.c |
1252 | +M src/gpk-modal-dialog.c |
1253 | +M src/gpk-self-test.c |
1254 | +M src/gpk-task.c |
1255 | +M src/gpk-task.h |
1256 | + |
1257 | +commit f341c65a7967c1a8c276cdfc4e66cf2c9a20c171 |
1258 | Author: Richard Hughes <richard@hughsie.com> |
1259 | Date: 2013-04-11 |
1260 | |
1261 | @@ -268,7 +1177,7 @@ |
1262 | M src/gpk-dbus.c |
1263 | M src/gpk-dbus.h |
1264 | |
1265 | -commit 15731a36c5d750421181276705a54e122328b056 |
1266 | +commit c627554a91a044991700dcf28b25f54eaa6d383f |
1267 | Author: Richard Hughes <richard@hughsie.com> |
1268 | Date: 2013-04-11 |
1269 | |
1270 | @@ -282,7 +1191,7 @@ |
1271 | M src/gpk-install-package-name.c |
1272 | M src/gpk-install-provide-file.c |
1273 | |
1274 | -commit 06e5bcea3fb2488befef2b1fc18725a5a34ce105 |
1275 | +commit b08c1ff3f924b085acb9a01ee7bf9e4d2b20fcff |
1276 | Author: Richard Hughes <richard@hughsie.com> |
1277 | Date: 2013-04-11 |
1278 | |
1279 | @@ -290,103 +1199,7 @@ |
1280 | |
1281 | M contrib/gnome-packagekit.spec.in |
1282 | |
1283 | -commit a9d5b9e8592499f0e3163c2ce347304d9c0f70cf |
1284 | -Author: Fran Diéguez <fran.dieguez@mabishu.com> |
1285 | -Date: 2013-04-15 |
1286 | - |
1287 | - Updated Galician translations |
1288 | - |
1289 | -M po/gl.po |
1290 | - |
1291 | -commit 3e55481a925047c9594e8b949599143463d760c2 |
1292 | -Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
1293 | -Date: 2013-04-14 |
1294 | - |
1295 | - Updated Brazilian Portuguese translation |
1296 | - |
1297 | -M po/pt_BR.po |
1298 | - |
1299 | -commit 4c235cecf281b434da305f3479bbfb2a5f9d4bfa |
1300 | -Author: Dimitris Spingos <dmtrs32@gmail.com> |
1301 | -Date: 2013-04-14 |
1302 | - |
1303 | - Updated Greek translation |
1304 | - |
1305 | -M po/el.po |
1306 | - |
1307 | -commit 19cea5d550e39654d600656c20b3161d52f889ca |
1308 | -Author: Akom Chotiphantawanon <knight2000@gmail.com> |
1309 | -Date: 2013-04-14 |
1310 | - |
1311 | - Updated Thai translation |
1312 | - |
1313 | -M po/th.po |
1314 | - |
1315 | -commit 6b30e5ef2b6f0eeb8fe75b28f191a5d7b51b8355 |
1316 | -Author: Carles Ferrando <carles.ferrando@gmail.com> |
1317 | -Date: 2013-04-14 |
1318 | - |
1319 | - [l10n] Updated Catalan (Valencian) translation |
1320 | - |
1321 | -M po/ca@valencia.po |
1322 | - |
1323 | -commit eddea49b70a22c33181ac16c41437c1658774864 |
1324 | -Author: Gil Forcada <gforcada@gnome.org> |
1325 | -Date: 2013-04-14 |
1326 | - |
1327 | - [l10n] Update Catalan translation |
1328 | - |
1329 | -M po/ca.po |
1330 | - |
1331 | -commit 883768fe2d67c910d7e9247a7970256a295e4c04 |
1332 | -Author: Gabor Kelemen <kelemeng@gnome.hu> |
1333 | -Date: 2013-04-14 |
1334 | - |
1335 | - Updated Hungarian translation |
1336 | - |
1337 | -M po/hu.po |
1338 | - |
1339 | -commit 2b28828fe5c4a63368d14cc09c40e94e7ecbc81e |
1340 | -Author: Marek Černocký <marek@manet.cz> |
1341 | -Date: 2013-04-13 |
1342 | - |
1343 | - Updated Czech translation |
1344 | - |
1345 | -M po/cs.po |
1346 | - |
1347 | -commit a1ba7f6f95b37f137aeb2a7ec3ac6e77f1fcf770 |
1348 | -Author: Piotr Drąg <piotrdrag@gmail.com> |
1349 | -Date: 2013-04-13 |
1350 | - |
1351 | - Updated Polish translation |
1352 | - |
1353 | -M po/pl.po |
1354 | - |
1355 | -commit 37f5aff434355a2bb583cd8176615e6dd6cc977f |
1356 | -Author: Matthias Clasen <mclasen@redhat.com> |
1357 | -Date: 2013-04-10 |
1358 | - |
1359 | - Add some translator comments |
1360 | - |
1361 | - https://bugzilla.gnome.org/show_bug.cgi?id=687484 |
1362 | - |
1363 | - Signed-off-by: Richard Hughes <richard@hughsie.com> |
1364 | - |
1365 | -M src/gpk-common.c |
1366 | - |
1367 | -commit 66b18a13413bc392a86f837ff6398c02a73a2911 |
1368 | -Author: Matthias Clasen <mclasen@redhat.com> |
1369 | -Date: 2013-04-10 |
1370 | - |
1371 | - Mark strings as translatable |
1372 | - |
1373 | - https://bugzilla.gnome.org/show_bug.cgi?id=692987 |
1374 | - |
1375 | - Signed-off-by: Richard Hughes <richard@hughsie.com> |
1376 | - |
1377 | -M data/gpk-application.ui |
1378 | - |
1379 | -commit c3f4dc4ddf6243faf39213f8841b473d0b5b7c96 |
1380 | +commit b6c42e4417b9e8c6cbad69910f2c6eccc8f1c3f4 |
1381 | Author: Richard Hughes <richard@hughsie.com> |
1382 | Date: 2013-04-10 |
1383 | |
1384 | @@ -396,7 +1209,7 @@ |
1385 | |
1386 | M data/gpk-update-viewer.desktop.in |
1387 | |
1388 | -commit f1a856aa1cca22f957eda28a0fdb6acc63368f5d |
1389 | +commit b095f82e36152a75844f4fa2cf51a2a39978a7fe |
1390 | Author: Richard Hughes <richard@hughsie.com> |
1391 | Date: 2013-04-09 |
1392 | |
1393 | @@ -404,7 +1217,16 @@ |
1394 | |
1395 | M src/gpk-application.c |
1396 | |
1397 | -commit a7a34d92657ccad2f58964dbe0c2fc025fd96204 |
1398 | +commit 78b6aa1b036e19b389a28e4e24568bd9b233133b |
1399 | +Author: Richard Hughes <richard@hughsie.com> |
1400 | +Date: 2013-04-09 |
1401 | + |
1402 | + trivial: Post branch version update |
1403 | + |
1404 | +M RELEASE |
1405 | +M configure.ac |
1406 | + |
1407 | +commit 16e9f6870d0c13dfe18cba1b542440873422845a |
1408 | Author: Bruce Cowan <bruce@bcowan.me.uk> |
1409 | Date: 2013-04-06 |
1410 | |
1411 | @@ -412,7 +1234,7 @@ |
1412 | |
1413 | M po/en_GB.po |
1414 | |
1415 | -commit 426677a5c5325a86a6d4dbb8941f72521e1da361 |
1416 | +commit 61e6393aca4579bac3bc79d8f559adebd780bff4 |
1417 | Author: Wojciech Szczęsny <wszczesny@aviary.pl> |
1418 | Date: 2013-04-05 |
1419 | |
1420 | @@ -420,23 +1242,7 @@ |
1421 | |
1422 | M po/pl.po |
1423 | |
1424 | -commit 965fe26b329413d1f1477ed8f2268d40751d7e60 |
1425 | -Author: Kjartan Maraas <kmaraas@gnome.org> |
1426 | -Date: 2013-04-03 |
1427 | - |
1428 | - Updated Norwegian bokmål translation |
1429 | - |
1430 | -M po/nb.po |
1431 | - |
1432 | -commit eb64c220d7d5748d95cd19ed7c32e7524e7aae30 |
1433 | -Author: Inaki Larranaga Murgoitio <dooteo@zundan.com> |
1434 | -Date: 2013-04-02 |
1435 | - |
1436 | - Updated Basque language |
1437 | - |
1438 | -M po/eu.po |
1439 | - |
1440 | -commit 01f506fd0c3fcdb8a89a4c36084d09d76cf89445 |
1441 | +commit 39dac32176e42ebd29cbfb1942c84b8e9e8f1a8b |
1442 | Author: OKANO Takayoshi <kano@na.rim.or.jp> |
1443 | Date: 2013-04-01 |
1444 | |
1445 | @@ -444,7 +1250,7 @@ |
1446 | |
1447 | M po/ja.po |
1448 | |
1449 | -commit d52639218ee9b144e3d9bb224ce19ef251ffd15a |
1450 | +commit 7930c5cd0655d58f1eed5ed3d48f0dcadaba137c |
1451 | Author: Fran Diéguez <fran.dieguez@mabishu.com> |
1452 | Date: 2013-03-27 |
1453 | |
1454 | |
1455 | === modified file 'INSTALL' |
1456 | --- INSTALL 2013-06-04 14:16:12 +0000 |
1457 | +++ INSTALL 2014-01-19 08:25:25 +0000 |
1458 | @@ -1,7 +1,7 @@ |
1459 | Installation Instructions |
1460 | ************************* |
1461 | |
1462 | -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, |
1463 | +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, |
1464 | Inc. |
1465 | |
1466 | Copying and distribution of this file, with or without modification, |
1467 | |
1468 | === modified file 'Makefile.in' |
1469 | --- Makefile.in 2013-06-04 14:16:12 +0000 |
1470 | +++ Makefile.in 2014-01-19 08:25:25 +0000 |
1471 | @@ -1,7 +1,7 @@ |
1472 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
1473 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
1474 | # @configure_input@ |
1475 | |
1476 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
1477 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1478 | |
1479 | # This Makefile.in is free software; the Free Software Foundation |
1480 | # gives unlimited permission to copy and/or distribute it, |
1481 | @@ -14,23 +14,51 @@ |
1482 | |
1483 | @SET_MAKE@ |
1484 | VPATH = @srcdir@ |
1485 | -am__make_dryrun = \ |
1486 | - { \ |
1487 | - am__dry=no; \ |
1488 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
1489 | +am__make_running_with_option = \ |
1490 | + case $${target_option-} in \ |
1491 | + ?) ;; \ |
1492 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
1493 | + "target option '$${target_option-}' specified" >&2; \ |
1494 | + exit 1;; \ |
1495 | + esac; \ |
1496 | + has_opt=no; \ |
1497 | + sane_makeflags=$$MAKEFLAGS; \ |
1498 | + if $(am__is_gnu_make); then \ |
1499 | + sane_makeflags=$$MFLAGS; \ |
1500 | + else \ |
1501 | case $$MAKEFLAGS in \ |
1502 | *\\[\ \ ]*) \ |
1503 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
1504 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
1505 | - *) \ |
1506 | - for am__flg in $$MAKEFLAGS; do \ |
1507 | - case $$am__flg in \ |
1508 | - *=*|--*) ;; \ |
1509 | - *n*) am__dry=yes; break;; \ |
1510 | - esac; \ |
1511 | - done;; \ |
1512 | - esac; \ |
1513 | - test $$am__dry = yes; \ |
1514 | - } |
1515 | + bs=\\; \ |
1516 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
1517 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
1518 | + esac; \ |
1519 | + fi; \ |
1520 | + skip_next=no; \ |
1521 | + strip_trailopt () \ |
1522 | + { \ |
1523 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
1524 | + }; \ |
1525 | + for flg in $$sane_makeflags; do \ |
1526 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
1527 | + case $$flg in \ |
1528 | + *=*|--*) continue;; \ |
1529 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
1530 | + -*I?*) strip_trailopt 'I';; \ |
1531 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
1532 | + -*O?*) strip_trailopt 'O';; \ |
1533 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
1534 | + -*l?*) strip_trailopt 'l';; \ |
1535 | + -[dEDm]) skip_next=yes;; \ |
1536 | + -[JT]) skip_next=yes;; \ |
1537 | + esac; \ |
1538 | + case $$flg in \ |
1539 | + *$$target_option*) has_opt=yes; break;; \ |
1540 | + esac; \ |
1541 | + done; \ |
1542 | + test $$has_opt = yes |
1543 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
1544 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
1545 | pkgdatadir = $(datadir)/@PACKAGE@ |
1546 | pkgincludedir = $(includedir)/@PACKAGE@ |
1547 | pkglibdir = $(libdir)/@PACKAGE@ |
1548 | @@ -211,6 +239,7 @@ |
1549 | GREP = @GREP@ |
1550 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
1551 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
1552 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
1553 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
1554 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
1555 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
1556 | @@ -455,13 +484,12 @@ |
1557 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
1558 | # (2) otherwise, pass the desired values on the 'make' command line. |
1559 | $(am__recursive_targets): |
1560 | - @fail= failcom='exit 1'; \ |
1561 | - for f in x $$MAKEFLAGS; do \ |
1562 | - case $$f in \ |
1563 | - *=* | --[!k]*);; \ |
1564 | - *k*) failcom='fail=yes';; \ |
1565 | - esac; \ |
1566 | - done; \ |
1567 | + @fail=; \ |
1568 | + if $(am__make_keepgoing); then \ |
1569 | + failcom='fail=yes'; \ |
1570 | + else \ |
1571 | + failcom='exit 1'; \ |
1572 | + fi; \ |
1573 | dot_seen=no; \ |
1574 | target=`echo $@ | sed s/-recursive//`; \ |
1575 | case "$@" in \ |
1576 | |
1577 | === modified file 'NEWS' |
1578 | --- NEWS 2013-06-04 14:16:12 +0000 |
1579 | +++ NEWS 2014-01-19 08:25:25 +0000 |
1580 | @@ -1,63 +1,116 @@ |
1581 | -Version 3.8.2 |
1582 | -~~~~~~~~~~~~~ |
1583 | -Released: 2013-05-13 |
1584 | - |
1585 | -* Translations |
1586 | +Version 3.10.1 |
1587 | +~~~~~~~~~~~~~~ |
1588 | +Released: 2013-10-14 |
1589 | + |
1590 | +* Translations |
1591 | + - Added Brazilian Portuguese translation for help files (Rafael Ferreira) |
1592 | + - Updated Catalan (Valencian) translation (Carles Ferrando) |
1593 | + - Updated Czech translation (Marek Černocký) |
1594 | + - Updated Italian translation (Gianvito Cavasoli) |
1595 | + - Updated Norwegian bokmål translation (Kjartan Maraas) |
1596 | + - Updated Serbian translation (Мирослав Николић) |
1597 | + - Updated Traditional Chinese translation (Cheng-Chia Tseng) |
1598 | + - Updated Turkish translation (Muhammet Kara) |
1599 | + |
1600 | +* New Features: |
1601 | + - Use the new 16:9 AppData screenshots (Richard Hughes) |
1602 | + |
1603 | +* Bugfix: |
1604 | + - Add Copyright information to the AppData files (Richard Hughes) |
1605 | + |
1606 | +Version 3.10.0 |
1607 | +~~~~~~~~~~~~~~ |
1608 | +Released: 2013-09-24 |
1609 | + |
1610 | +* Translations |
1611 | + - Updated Basque translation (Inaki Larranaga Murgoitio) |
1612 | + - Updated Catalan translation (Josep Sànchez) |
1613 | + - Updated Danish translation (Kris Thomsen) |
1614 | + - Updated Finnish translation (Jiri Grönroos) |
1615 | + - Updated German translation (Benjamin Steinwender) |
1616 | + - Updated Irish translation (Seán de Búrca) |
1617 | + - Updated Japanese translation (Jiro Matsuzawa) |
1618 | + - Updated Korean translation (Changwoo Ryu) |
1619 | + - Updated Portuguese translation (António Lima) |
1620 | + - Updated Punjabi translation (A S Alam) |
1621 | + - Updated Russian translation (Dmitriy S. Seregin) |
1622 | + - Updated Slovak translation (Pavol Klačanský) |
1623 | + - Updated Thai translation (Akom Chotiphantawanon) |
1624 | + - Updated Traditional Chinese translation (Chao-Hsiung Liao) |
1625 | + - Updated Ukrainian translation (Daniel Korostil) |
1626 | + |
1627 | +Version 3.9.92 |
1628 | +~~~~~~~~~~~~~~ |
1629 | +Released: 2013-09-13 |
1630 | + |
1631 | +* Translations |
1632 | + - Updated Catalan translation (Gil Forcada) |
1633 | - Updated Assamese translation (Nilamdyuti Goswami) |
1634 | + - Updated Belarusian translation (Ihar Hrachyshka) |
1635 | + - Updated Brazilian Portuguese translation (Enrico Nicoletto) |
1636 | + - Updated Brazilian Portuguese translation (Rafael Ferreira) |
1637 | + - Updated British English translation (Bruce Cowan) |
1638 | + - Updated Catalan translation (Sílvia Miranda) |
1639 | + - Updated Catalan (Valencian) translation (Carles Ferrando) |
1640 | + - Updated Czech translation (Marek Černocký) |
1641 | - Updated Danish translation (Ask H. Larsen) |
1642 | + - Updated Estonian translation (Mattias Põldaru) |
1643 | + - Updated Finnish translation (Timo Jyrinki) |
1644 | + - Updated Galician translation (Fran Diéguez) |
1645 | - Updated German translation (Christian Kirbach) |
1646 | + - Updated Greek translation (Dimitris Spingos) |
1647 | - Updated Gujarati translation (Sweta Kothari) |
1648 | - - Updated Hindi translation (Rajesh Ranjan) |
1649 | + - Updated Hebrew translation (Yaron Shahrabani) |
1650 | + - Updated Hungarian translation (Balázs Úr) |
1651 | + - Updated Hungarian translation (Gabor Kelemen) |
1652 | - Updated Indonesian translation (Andika Triwidada) |
1653 | + - Updated Irish translation (Seán de Búrca) |
1654 | - Updated Italian translation (Gianvito Cavasoli) |
1655 | - - Updated Japanese translation (Jiro Matsuzawa) |
1656 | + - Updated kn translation (Shankar Prasad) |
1657 | + - Updated Latvian translation (Rūdolfs Mazurs) |
1658 | - Updated Lithuanian translation (Aurimas Černius) |
1659 | + - Updated Malayalam translation (Anish A) |
1660 | + - Updated Marathi translation (Sandeep Sheshrao Shedmake) |
1661 | - Updated Norwegian bokmål translation (Kjartan Maraas) |
1662 | - Updated Odia translation (ManojKumar Giri) |
1663 | - - Updated Punjabi translation (A S Alam) |
1664 | + - Updated Polish translation (Piotr Drąg) |
1665 | + - Updated Polish translation (Wojciech Szczęsny) |
1666 | - Updated Russian translation (Yuri Myasoedov) |
1667 | - Updated Serbian translation (Мирослав Николић) |
1668 | + - Updated slovak translation (Dušan Kazik) |
1669 | + - Updated Slovenian translation (Matej Urbančič) |
1670 | + - Updated Spanish translation (Daniel Mustieles) |
1671 | + - Updated Tajik translation (Victor Ibragimov) |
1672 | + - Updated Tamil translation (Shantha kumar) |
1673 | + - Updated Telugu translation (Krishnababu Krothapalli) |
1674 | + - Updated Thai translation (Akom Chotiphantawanon) |
1675 | + - Updated Traditional Chinese translation (Cheng-Chia Tseng) |
1676 | + - Updated Japanese translation (Jiro Matsuzawa) |
1677 | + - Updated Japanese translation (OKANO Takayoshi) |
1678 | - Updated Simplified Chinese translation (Wylmer Wang) |
1679 | - - Updated Slovenian translation (Matej Urbančič) |
1680 | - - Updated Spanish translation (Daniel Mustieles) |
1681 | - - Updated Tamil translation (Shantha kumar) |
1682 | - - Updated Telugu translations (Krishnababu Krothapalli) |
1683 | |
1684 | -* Bugfix: |
1685 | - - Fix the search menu (Matthias Clasen) |
1686 | +* New Features: |
1687 | + - Add some desktop file categories (Elad Alfassa) |
1688 | + - Add two AppData files for gnome-software (Richard Hughes) |
1689 | - Open Listaller packages with gpk-install-local-file (Matthias Klumpp) |
1690 | - - Update the man pages to reflect reality (Richard Hughes) |
1691 | - |
1692 | -Version 3.8.1 |
1693 | -~~~~~~~~~~~~~ |
1694 | -Released: 2013-04-15 |
1695 | - |
1696 | -* Translations |
1697 | - - Updated Basque language (Inaki Larranaga Murgoitio) |
1698 | - - Updated Brazilian Portuguese translation (Rafael Ferreira) |
1699 | - - Updated British English translation (Bruce Cowan) |
1700 | - - Updated Catalan translation (Gil Forcada) |
1701 | - - Updated Catalan (Valencian) translation (Carles Ferrando) |
1702 | - - Updated Czech translation (Marek Černocký) |
1703 | - - Updated Galician translation (Fran Diéguez) |
1704 | - - Updated Greek translation (Dimitris Spingos) |
1705 | - - Updated Hungarian translation (Gabor Kelemen) |
1706 | - - Updated Japanese translation (OKANO Takayoshi) |
1707 | - - Updated Norwegian bokmål translation (Kjartan Maraas) |
1708 | - - Updated Polish translation (Piotr Drąg) |
1709 | - - Updated Polish translation (Wojciech Szczęsny) |
1710 | - - Updated Thai translation (Akom Chotiphantawanon) |
1711 | - |
1712 | -* New Features: |
1713 | - - Show the update viewer in the app overview (Richard Hughes) |
1714 | |
1715 | * Bugfix: |
1716 | - - Add some translator comments (Matthias Clasen) |
1717 | + - Change the name of the package installer from 'Software' to 'Packages' (Richard Hughes) |
1718 | - Do not maximize by default as we do not have a draggable header yet (Richard Hughes) |
1719 | - Do not try and duplicate all the PackageKit errors in the session helper (Richard Hughes) |
1720 | - - Mark strings as translatable (Matthias Clasen) |
1721 | + - Do not use the deprecated gtk_icon_size_lookup_for_settings() (Richard Hughes) |
1722 | + - Don't pass relative file-paths to the session-service (Matthias Klumpp) |
1723 | + - Ignore package progress updates when the transaction is being simulated (Richard Hughes) |
1724 | + - Mark some strings as translatable (Matthias Clasen) |
1725 | - Never show two modal dialog boxes when using the install helpers (Richard Hughes) |
1726 | - - Show a meaningful name in the about dialog (Matthias Clasen) |
1727 | + - Port from a homegrown EggTest to GTest (Richard Hughes) |
1728 | + - Remove redundant calls to g_type_init (Matthias Klumpp) |
1729 | + - Set the default height of the details expander (Gary Ching-Pang Lin) |
1730 | + - Show a meaningful name in the about dialog (Michael Catanzaro, Matthias Clasen) |
1731 | + - Show the update viewer in the app overview (Richard Hughes) |
1732 | + - Swapped "Required packages" and "Dependent packages" button functionality (Ignaker) |
1733 | + - Updated the man pages to reflect reality (Richard Hughes) |
1734 | + - Use a reasonable default window size (Michael Catanzaro) |
1735 | |
1736 | Version 3.8.0 |
1737 | ~~~~~~~~~~~~~ |
1738 | |
1739 | === modified file 'aclocal.m4' |
1740 | --- aclocal.m4 2013-06-04 14:16:12 +0000 |
1741 | +++ aclocal.m4 2014-01-19 08:25:25 +0000 |
1742 | @@ -1,6 +1,6 @@ |
1743 | -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- |
1744 | +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- |
1745 | |
1746 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
1747 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1748 | |
1749 | # This file is free software; the Free Software Foundation |
1750 | # gives unlimited permission to copy and/or distribute it, |
1751 | @@ -35,7 +35,7 @@ |
1752 | [am__api_version='1.13' |
1753 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1754 | dnl require some minimum version. Point them to the right macro. |
1755 | -m4_if([$1], [1.13.1], [], |
1756 | +m4_if([$1], [1.13.4], [], |
1757 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1758 | ]) |
1759 | |
1760 | @@ -51,7 +51,7 @@ |
1761 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1762 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1763 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1764 | -[AM_AUTOMAKE_VERSION([1.13.1])dnl |
1765 | +[AM_AUTOMAKE_VERSION([1.13.4])dnl |
1766 | m4_ifndef([AC_AUTOCONF_VERSION], |
1767 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1768 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1769 | @@ -373,7 +373,7 @@ |
1770 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
1771 | test -z "$DEPDIR" && continue |
1772 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
1773 | - test -z "am__include" && continue |
1774 | + test -z "$am__include" && continue |
1775 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1776 | # Find all dependency output files, they are included files with |
1777 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
1778 | @@ -1209,76 +1209,114 @@ |
1779 | # Substitute a variable $(am__untar) that extract such |
1780 | # a tarball read from stdin. |
1781 | # $(am__untar) < result.tar |
1782 | +# |
1783 | AC_DEFUN([_AM_PROG_TAR], |
1784 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1785 | # in the wild :-( We should find a proper way to deprecate it ... |
1786 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1787 | + |
1788 | +# We'll loop over all known methods to create a tar archive until one works. |
1789 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1790 | + |
1791 | m4_if([$1], [v7], |
1792 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1793 | - [m4_case([$1], [ustar],, [pax],, |
1794 | - [m4_fatal([Unknown tar format])]) |
1795 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
1796 | -# Loop over all known methods to create a tar archive until one works. |
1797 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1798 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1799 | -# Do not fold the above two line into one, because Tru64 sh and |
1800 | -# Solaris sh will not grok spaces in the rhs of '-'. |
1801 | -for _am_tool in $_am_tools |
1802 | -do |
1803 | - case $_am_tool in |
1804 | - gnutar) |
1805 | - for _am_tar in tar gnutar gtar; |
1806 | - do |
1807 | - AM_RUN_LOG([$_am_tar --version]) && break |
1808 | - done |
1809 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1810 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1811 | - am__untar="$_am_tar -xf -" |
1812 | - ;; |
1813 | - plaintar) |
1814 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
1815 | - # ustar tarball either. |
1816 | - (tar --version) >/dev/null 2>&1 && continue |
1817 | - am__tar='tar chf - "$$tardir"' |
1818 | - am__tar_='tar chf - "$tardir"' |
1819 | - am__untar='tar xf -' |
1820 | - ;; |
1821 | - pax) |
1822 | - am__tar='pax -L -x $1 -w "$$tardir"' |
1823 | - am__tar_='pax -L -x $1 -w "$tardir"' |
1824 | - am__untar='pax -r' |
1825 | - ;; |
1826 | - cpio) |
1827 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1828 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1829 | - am__untar='cpio -i -H $1 -d' |
1830 | - ;; |
1831 | - none) |
1832 | - am__tar=false |
1833 | - am__tar_=false |
1834 | - am__untar=false |
1835 | - ;; |
1836 | - esac |
1837 | - |
1838 | - # If the value was cached, stop now. We just wanted to have am__tar |
1839 | - # and am__untar set. |
1840 | - test -n "${am_cv_prog_tar_$1}" && break |
1841 | - |
1842 | - # tar/untar a dummy directory, and stop if the command works |
1843 | - rm -rf conftest.dir |
1844 | - mkdir conftest.dir |
1845 | - echo GrepMe > conftest.dir/file |
1846 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1847 | - rm -rf conftest.dir |
1848 | - if test -s conftest.tar; then |
1849 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
1850 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1851 | - fi |
1852 | -done |
1853 | -rm -rf conftest.dir |
1854 | - |
1855 | -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1856 | -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1857 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1858 | + |
1859 | + [m4_case([$1], |
1860 | + [ustar], |
1861 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
1862 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
1863 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
1864 | + # and bug#13588). |
1865 | + am_max_uid=2097151 # 2^21 - 1 |
1866 | + am_max_gid=$am_max_uid |
1867 | + # The $UID and $GID variables are not portable, so we need to resort |
1868 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
1869 | + # below are definitely unexpected, so allow the users to see them |
1870 | + # (that is, avoid stderr redirection). |
1871 | + am_uid=`id -u || echo unknown` |
1872 | + am_gid=`id -g || echo unknown` |
1873 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
1874 | + if test $am_uid -le $am_max_uid; then |
1875 | + AC_MSG_RESULT([yes]) |
1876 | + else |
1877 | + AC_MSG_RESULT([no]) |
1878 | + _am_tools=none |
1879 | + fi |
1880 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
1881 | + if test $am_gid -le $am_max_gid; then |
1882 | + AC_MSG_RESULT([yes]) |
1883 | + else |
1884 | + AC_MSG_RESULT([no]) |
1885 | + _am_tools=none |
1886 | + fi], |
1887 | + |
1888 | + [pax], |
1889 | + [], |
1890 | + |
1891 | + [m4_fatal([Unknown tar format])]) |
1892 | + |
1893 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
1894 | + |
1895 | + # Go ahead even if we have the value already cached. We do so because we |
1896 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
1897 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1898 | + |
1899 | + for _am_tool in $_am_tools; do |
1900 | + case $_am_tool in |
1901 | + gnutar) |
1902 | + for _am_tar in tar gnutar gtar; do |
1903 | + AM_RUN_LOG([$_am_tar --version]) && break |
1904 | + done |
1905 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1906 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1907 | + am__untar="$_am_tar -xf -" |
1908 | + ;; |
1909 | + plaintar) |
1910 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
1911 | + # ustar tarball either. |
1912 | + (tar --version) >/dev/null 2>&1 && continue |
1913 | + am__tar='tar chf - "$$tardir"' |
1914 | + am__tar_='tar chf - "$tardir"' |
1915 | + am__untar='tar xf -' |
1916 | + ;; |
1917 | + pax) |
1918 | + am__tar='pax -L -x $1 -w "$$tardir"' |
1919 | + am__tar_='pax -L -x $1 -w "$tardir"' |
1920 | + am__untar='pax -r' |
1921 | + ;; |
1922 | + cpio) |
1923 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1924 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1925 | + am__untar='cpio -i -H $1 -d' |
1926 | + ;; |
1927 | + none) |
1928 | + am__tar=false |
1929 | + am__tar_=false |
1930 | + am__untar=false |
1931 | + ;; |
1932 | + esac |
1933 | + |
1934 | + # If the value was cached, stop now. We just wanted to have am__tar |
1935 | + # and am__untar set. |
1936 | + test -n "${am_cv_prog_tar_$1}" && break |
1937 | + |
1938 | + # tar/untar a dummy directory, and stop if the command works. |
1939 | + rm -rf conftest.dir |
1940 | + mkdir conftest.dir |
1941 | + echo GrepMe > conftest.dir/file |
1942 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1943 | + rm -rf conftest.dir |
1944 | + if test -s conftest.tar; then |
1945 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
1946 | + AM_RUN_LOG([cat conftest.dir/file]) |
1947 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1948 | + fi |
1949 | + done |
1950 | + rm -rf conftest.dir |
1951 | + |
1952 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1953 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1954 | + |
1955 | AC_SUBST([am__tar]) |
1956 | AC_SUBST([am__untar]) |
1957 | ]) # _AM_PROG_TAR |
1958 | @@ -10322,6 +10360,21 @@ |
1959 | m4_popdef([pkg_description]) |
1960 | ]) dnl PKG_NOARCH_INSTALLDIR |
1961 | |
1962 | + |
1963 | +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
1964 | +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
1965 | +# ------------------------------------------- |
1966 | +# Retrieves the value of the pkg-config variable for the given module. |
1967 | +AC_DEFUN([PKG_CHECK_VAR], |
1968 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
1969 | +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
1970 | + |
1971 | +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
1972 | +AS_VAR_COPY([$1], [pkg_cv_][$1]) |
1973 | + |
1974 | +AS_VAR_IF([$1], [""], [$5], [$4])dnl |
1975 | +])# PKG_CHECK_VAR |
1976 | + |
1977 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. |
1978 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. |
1979 | # |
1980 | @@ -10639,7 +10692,6 @@ |
1981 | dnl |
1982 | glib_DEFUN([GLIB_GNU_GETTEXT], |
1983 | [AC_REQUIRE([AC_PROG_CC])dnl |
1984 | - AC_REQUIRE([AC_HEADER_STDC])dnl |
1985 | |
1986 | GLIB_LC_MESSAGES |
1987 | GLIB_WITH_NLS |
1988 | @@ -10759,10 +10811,20 @@ |
1989 | fi]) |
1990 | |
1991 | |
1992 | +# gnome-compiler-flags.m4 |
1993 | +# |
1994 | +# serial 2 |
1995 | +# |
1996 | + |
1997 | dnl GNOME_COMPILE_WARNINGS |
1998 | dnl Turn on many useful compiler warnings and substitute the result into |
1999 | dnl WARN_CFLAGS |
2000 | dnl For now, only works on GCC |
2001 | +dnl Pass the default value of the --enable-compile-warnings configure option as |
2002 | +dnl the first argument to the macro, defaulting to 'yes'. |
2003 | +dnl Additional warning/error flags can be passed as an optional second argument. |
2004 | +dnl |
2005 | +dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) |
2006 | AC_DEFUN([GNOME_COMPILE_WARNINGS],[ |
2007 | dnl ****************************** |
2008 | dnl More compiler warnings |
2009 | @@ -10802,6 +10864,11 @@ |
2010 | -Werror=missing-include-dirs \ |
2011 | " |
2012 | |
2013 | + dnl Additional warning or error flags provided by the module author to |
2014 | + dnl allow stricter standards to be imposed on a per-module basis. |
2015 | + dnl The author can pass -W or -Werror flags here as they see fit. |
2016 | + additional_flags="m4_default([$2],[])" |
2017 | + |
2018 | case "$enable_compile_warnings" in |
2019 | no) |
2020 | warning_flags= |
2021 | @@ -10810,10 +10877,10 @@ |
2022 | warning_flags="-Wall" |
2023 | ;; |
2024 | yes) |
2025 | - warning_flags="$base_warn_flags $base_error_flags" |
2026 | + warning_flags="$base_warn_flags $base_error_flags $additional_flags" |
2027 | ;; |
2028 | maximum|error) |
2029 | - warning_flags="$base_warn_flags $base_error_flags" |
2030 | + warning_flags="$base_warn_flags $base_error_flags $additional_flags" |
2031 | ;; |
2032 | *) |
2033 | AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) |
2034 | @@ -11022,7 +11089,12 @@ |
2035 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
2036 | |
2037 | dnl check for tools we added during development |
2038 | - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) |
2039 | + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that |
2040 | + dnl may not be writable by the user. Currently, automake requires that the |
2041 | + dnl test name must end in '.test'. |
2042 | + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 |
2043 | + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) |
2044 | + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) |
2045 | AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) |
2046 | AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) |
2047 | |
2048 | @@ -11135,7 +11207,8 @@ |
2049 | .PHONY: pot |
2050 | pot: $(_HELP_POTFILE) |
2051 | $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) |
2052 | - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) |
2053 | + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ |
2054 | + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") |
2055 | |
2056 | .PHONY: repo |
2057 | repo: $(_HELP_POTFILE) |
2058 | |
2059 | === modified file 'configure' |
2060 | --- configure 2013-06-04 14:16:12 +0000 |
2061 | +++ configure 2014-01-19 08:25:25 +0000 |
2062 | @@ -1,6 +1,6 @@ |
2063 | #! /bin/sh |
2064 | # Guess values for system-dependent variables and create Makefiles. |
2065 | -# Generated by GNU Autoconf 2.69 for gnome-packagekit 3.8.2. |
2066 | +# Generated by GNU Autoconf 2.69 for gnome-packagekit 3.10.1. |
2067 | # |
2068 | # |
2069 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
2070 | @@ -587,8 +587,8 @@ |
2071 | # Identity of this package. |
2072 | PACKAGE_NAME='gnome-packagekit' |
2073 | PACKAGE_TARNAME='gnome-packagekit' |
2074 | -PACKAGE_VERSION='3.8.2' |
2075 | -PACKAGE_STRING='gnome-packagekit 3.8.2' |
2076 | +PACKAGE_VERSION='3.10.1' |
2077 | +PACKAGE_STRING='gnome-packagekit 3.10.1' |
2078 | PACKAGE_BUGREPORT='' |
2079 | PACKAGE_URL='' |
2080 | |
2081 | @@ -712,6 +712,7 @@ |
2082 | HTML_DIR |
2083 | GTKDOC_MKPDF |
2084 | GTKDOC_REBASE |
2085 | +GTKDOC_CHECK_PATH |
2086 | GTKDOC_CHECK |
2087 | PKG_CONFIG_LIBDIR |
2088 | PKG_CONFIG_PATH |
2089 | @@ -1474,7 +1475,7 @@ |
2090 | # Omit some internal or obsolete options to make the list less imposing. |
2091 | # This message is too long to be a string in the A/UX 3.1 sh. |
2092 | cat <<_ACEOF |
2093 | -\`configure' configures gnome-packagekit 3.8.2 to adapt to many kinds of systems. |
2094 | +\`configure' configures gnome-packagekit 3.10.1 to adapt to many kinds of systems. |
2095 | |
2096 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2097 | |
2098 | @@ -1545,7 +1546,7 @@ |
2099 | |
2100 | if test -n "$ac_init_help"; then |
2101 | case $ac_init_help in |
2102 | - short | recursive ) echo "Configuration of gnome-packagekit 3.8.2:";; |
2103 | + short | recursive ) echo "Configuration of gnome-packagekit 3.10.1:";; |
2104 | esac |
2105 | cat <<\_ACEOF |
2106 | |
2107 | @@ -1709,7 +1710,7 @@ |
2108 | test -n "$ac_init_help" && exit $ac_status |
2109 | if $ac_init_version; then |
2110 | cat <<\_ACEOF |
2111 | -gnome-packagekit configure 3.8.2 |
2112 | +gnome-packagekit configure 3.10.1 |
2113 | generated by GNU Autoconf 2.69 |
2114 | |
2115 | Copyright (C) 2012 Free Software Foundation, Inc. |
2116 | @@ -2074,7 +2075,7 @@ |
2117 | This file contains any messages produced by compilers while |
2118 | running configure, to aid debugging if configure makes a mistake. |
2119 | |
2120 | -It was created by gnome-packagekit $as_me 3.8.2, which was |
2121 | +It was created by gnome-packagekit $as_me 3.10.1, which was |
2122 | generated by GNU Autoconf 2.69. Invocation command line was |
2123 | |
2124 | $ $0 $@ |
2125 | @@ -2938,7 +2939,7 @@ |
2126 | |
2127 | # Define the identity of the package. |
2128 | PACKAGE='gnome-packagekit' |
2129 | - VERSION='3.8.2' |
2130 | + VERSION='3.10.1' |
2131 | |
2132 | |
2133 | cat >>confdefs.h <<_ACEOF |
2134 | @@ -2979,92 +2980,132 @@ |
2135 | AMTAR='$${TAR-tar}' |
2136 | |
2137 | |
2138 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
2139 | +# We'll loop over all known methods to create a tar archive until one works. |
2140 | +_am_tools='gnutar plaintar pax cpio none' |
2141 | + |
2142 | +# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
2143 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
2144 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
2145 | + # and bug#13588). |
2146 | + am_max_uid=2097151 # 2^21 - 1 |
2147 | + am_max_gid=$am_max_uid |
2148 | + # The $UID and $GID variables are not portable, so we need to resort |
2149 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
2150 | + # below are definitely unexpected, so allow the users to see them |
2151 | + # (that is, avoid stderr redirection). |
2152 | + am_uid=`id -u || echo unknown` |
2153 | + am_gid=`id -g || echo unknown` |
2154 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 |
2155 | +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } |
2156 | + if test $am_uid -le $am_max_uid; then |
2157 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2158 | +$as_echo "yes" >&6; } |
2159 | + else |
2160 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2161 | +$as_echo "no" >&6; } |
2162 | + _am_tools=none |
2163 | + fi |
2164 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 |
2165 | +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } |
2166 | + if test $am_gid -le $am_max_gid; then |
2167 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2168 | +$as_echo "yes" >&6; } |
2169 | + else |
2170 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2171 | +$as_echo "no" >&6; } |
2172 | + _am_tools=none |
2173 | + fi |
2174 | + |
2175 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
2176 | $as_echo_n "checking how to create a ustar tar archive... " >&6; } |
2177 | -# Loop over all known methods to create a tar archive until one works. |
2178 | -_am_tools='gnutar plaintar pax cpio none' |
2179 | -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} |
2180 | -# Do not fold the above two line into one, because Tru64 sh and |
2181 | -# Solaris sh will not grok spaces in the rhs of '-'. |
2182 | -for _am_tool in $_am_tools |
2183 | -do |
2184 | - case $_am_tool in |
2185 | - gnutar) |
2186 | - for _am_tar in tar gnutar gtar; |
2187 | - do |
2188 | - { echo "$as_me:$LINENO: $_am_tar --version" >&5 |
2189 | + |
2190 | + # Go ahead even if we have the value already cached. We do so because we |
2191 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
2192 | + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} |
2193 | + |
2194 | + for _am_tool in $_am_tools; do |
2195 | + case $_am_tool in |
2196 | + gnutar) |
2197 | + for _am_tar in tar gnutar gtar; do |
2198 | + { echo "$as_me:$LINENO: $_am_tar --version" >&5 |
2199 | ($_am_tar --version) >&5 2>&5 |
2200 | ac_status=$? |
2201 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2202 | (exit $ac_status); } && break |
2203 | - done |
2204 | - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' |
2205 | - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' |
2206 | - am__untar="$_am_tar -xf -" |
2207 | - ;; |
2208 | - plaintar) |
2209 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
2210 | - # ustar tarball either. |
2211 | - (tar --version) >/dev/null 2>&1 && continue |
2212 | - am__tar='tar chf - "$$tardir"' |
2213 | - am__tar_='tar chf - "$tardir"' |
2214 | - am__untar='tar xf -' |
2215 | - ;; |
2216 | - pax) |
2217 | - am__tar='pax -L -x ustar -w "$$tardir"' |
2218 | - am__tar_='pax -L -x ustar -w "$tardir"' |
2219 | - am__untar='pax -r' |
2220 | - ;; |
2221 | - cpio) |
2222 | - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' |
2223 | - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' |
2224 | - am__untar='cpio -i -H ustar -d' |
2225 | - ;; |
2226 | - none) |
2227 | - am__tar=false |
2228 | - am__tar_=false |
2229 | - am__untar=false |
2230 | - ;; |
2231 | - esac |
2232 | - |
2233 | - # If the value was cached, stop now. We just wanted to have am__tar |
2234 | - # and am__untar set. |
2235 | - test -n "${am_cv_prog_tar_ustar}" && break |
2236 | - |
2237 | - # tar/untar a dummy directory, and stop if the command works |
2238 | - rm -rf conftest.dir |
2239 | - mkdir conftest.dir |
2240 | - echo GrepMe > conftest.dir/file |
2241 | - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 |
2242 | + done |
2243 | + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' |
2244 | + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' |
2245 | + am__untar="$_am_tar -xf -" |
2246 | + ;; |
2247 | + plaintar) |
2248 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
2249 | + # ustar tarball either. |
2250 | + (tar --version) >/dev/null 2>&1 && continue |
2251 | + am__tar='tar chf - "$$tardir"' |
2252 | + am__tar_='tar chf - "$tardir"' |
2253 | + am__untar='tar xf -' |
2254 | + ;; |
2255 | + pax) |
2256 | + am__tar='pax -L -x ustar -w "$$tardir"' |
2257 | + am__tar_='pax -L -x ustar -w "$tardir"' |
2258 | + am__untar='pax -r' |
2259 | + ;; |
2260 | + cpio) |
2261 | + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' |
2262 | + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' |
2263 | + am__untar='cpio -i -H ustar -d' |
2264 | + ;; |
2265 | + none) |
2266 | + am__tar=false |
2267 | + am__tar_=false |
2268 | + am__untar=false |
2269 | + ;; |
2270 | + esac |
2271 | + |
2272 | + # If the value was cached, stop now. We just wanted to have am__tar |
2273 | + # and am__untar set. |
2274 | + test -n "${am_cv_prog_tar_ustar}" && break |
2275 | + |
2276 | + # tar/untar a dummy directory, and stop if the command works. |
2277 | + rm -rf conftest.dir |
2278 | + mkdir conftest.dir |
2279 | + echo GrepMe > conftest.dir/file |
2280 | + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 |
2281 | (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 |
2282 | ac_status=$? |
2283 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2284 | (exit $ac_status); } |
2285 | - rm -rf conftest.dir |
2286 | - if test -s conftest.tar; then |
2287 | - { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 |
2288 | + rm -rf conftest.dir |
2289 | + if test -s conftest.tar; then |
2290 | + { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 |
2291 | ($am__untar <conftest.tar) >&5 2>&5 |
2292 | ac_status=$? |
2293 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2294 | (exit $ac_status); } |
2295 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2296 | - fi |
2297 | -done |
2298 | -rm -rf conftest.dir |
2299 | + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 |
2300 | + (cat conftest.dir/file) >&5 2>&5 |
2301 | + ac_status=$? |
2302 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2303 | + (exit $ac_status); } |
2304 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2305 | + fi |
2306 | + done |
2307 | + rm -rf conftest.dir |
2308 | |
2309 | -if ${am_cv_prog_tar_ustar+:} false; then : |
2310 | + if ${am_cv_prog_tar_ustar+:} false; then : |
2311 | $as_echo_n "(cached) " >&6 |
2312 | else |
2313 | am_cv_prog_tar_ustar=$_am_tool |
2314 | fi |
2315 | |
2316 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
2317 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
2318 | $as_echo "$am_cv_prog_tar_ustar" >&6; } |
2319 | |
2320 | |
2321 | |
2322 | |
2323 | |
2324 | + |
2325 | ac_config_headers="$ac_config_headers config.h" |
2326 | |
2327 | |
2328 | @@ -12412,6 +12453,8 @@ |
2329 | -Werror=missing-include-dirs \ |
2330 | " |
2331 | |
2332 | + additional_flags="" |
2333 | + |
2334 | case "$enable_compile_warnings" in |
2335 | no) |
2336 | warning_flags= |
2337 | @@ -12420,10 +12463,10 @@ |
2338 | warning_flags="-Wall" |
2339 | ;; |
2340 | yes) |
2341 | - warning_flags="$base_warn_flags $base_error_flags" |
2342 | + warning_flags="$base_warn_flags $base_error_flags $additional_flags" |
2343 | ;; |
2344 | maximum|error) |
2345 | - warning_flags="$base_warn_flags $base_error_flags" |
2346 | + warning_flags="$base_warn_flags $base_error_flags $additional_flags" |
2347 | ;; |
2348 | *) |
2349 | as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 |
2350 | @@ -12630,7 +12673,8 @@ |
2351 | .PHONY: pot |
2352 | pot: $(_HELP_POTFILE) |
2353 | $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) |
2354 | - $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) |
2355 | + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ |
2356 | + $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") |
2357 | |
2358 | .PHONY: repo |
2359 | repo: $(_HELP_POTFILE) |
2360 | @@ -12895,26 +12939,24 @@ |
2361 | |
2362 | |
2363 | |
2364 | - # Extract the first word of "gtkdoc-check", so it can be a program name with args. |
2365 | + # Extract the first word of "gtkdoc-check", so it can be a program name with args. |
2366 | set dummy gtkdoc-check; ac_word=$2 |
2367 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2368 | $as_echo_n "checking for $ac_word... " >&6; } |
2369 | -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : |
2370 | +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : |
2371 | $as_echo_n "(cached) " >&6 |
2372 | else |
2373 | - case $GTKDOC_CHECK in |
2374 | - [\\/]* | ?:[\\/]*) |
2375 | - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. |
2376 | - ;; |
2377 | - *) |
2378 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2379 | + if test -n "$GTKDOC_CHECK"; then |
2380 | + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. |
2381 | +else |
2382 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2383 | for as_dir in $PATH |
2384 | do |
2385 | IFS=$as_save_IFS |
2386 | test -z "$as_dir" && as_dir=. |
2387 | for ac_exec_ext in '' $ac_executable_extensions; do |
2388 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2389 | - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" |
2390 | + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" |
2391 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2392 | break 2 |
2393 | fi |
2394 | @@ -12922,10 +12964,9 @@ |
2395 | done |
2396 | IFS=$as_save_IFS |
2397 | |
2398 | - ;; |
2399 | -esac |
2400 | -fi |
2401 | -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK |
2402 | +fi |
2403 | +fi |
2404 | +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK |
2405 | if test -n "$GTKDOC_CHECK"; then |
2406 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 |
2407 | $as_echo "$GTKDOC_CHECK" >&6; } |
2408 | @@ -12935,6 +12976,46 @@ |
2409 | fi |
2410 | |
2411 | |
2412 | + # Extract the first word of "gtkdoc-check", so it can be a program name with args. |
2413 | +set dummy gtkdoc-check; ac_word=$2 |
2414 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2415 | +$as_echo_n "checking for $ac_word... " >&6; } |
2416 | +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : |
2417 | + $as_echo_n "(cached) " >&6 |
2418 | +else |
2419 | + case $GTKDOC_CHECK_PATH in |
2420 | + [\\/]* | ?:[\\/]*) |
2421 | + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. |
2422 | + ;; |
2423 | + *) |
2424 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2425 | +for as_dir in $PATH |
2426 | +do |
2427 | + IFS=$as_save_IFS |
2428 | + test -z "$as_dir" && as_dir=. |
2429 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2430 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2431 | + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" |
2432 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2433 | + break 2 |
2434 | + fi |
2435 | +done |
2436 | + done |
2437 | +IFS=$as_save_IFS |
2438 | + |
2439 | + ;; |
2440 | +esac |
2441 | +fi |
2442 | +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH |
2443 | +if test -n "$GTKDOC_CHECK_PATH"; then |
2444 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 |
2445 | +$as_echo "$GTKDOC_CHECK_PATH" >&6; } |
2446 | +else |
2447 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2448 | +$as_echo "no" >&6; } |
2449 | +fi |
2450 | + |
2451 | + |
2452 | for ac_prog in gtkdoc-rebase |
2453 | do |
2454 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2455 | @@ -16205,7 +16286,7 @@ |
2456 | # report actual input values of CONFIG_FILES etc. instead of their |
2457 | # values after options handling. |
2458 | ac_log=" |
2459 | -This file was extended by gnome-packagekit $as_me 3.8.2, which was |
2460 | +This file was extended by gnome-packagekit $as_me 3.10.1, which was |
2461 | generated by GNU Autoconf 2.69. Invocation command line was |
2462 | |
2463 | CONFIG_FILES = $CONFIG_FILES |
2464 | @@ -16271,7 +16352,7 @@ |
2465 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2466 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2467 | ac_cs_version="\\ |
2468 | -gnome-packagekit config.status 3.8.2 |
2469 | +gnome-packagekit config.status 3.10.1 |
2470 | configured by $0, generated by GNU Autoconf 2.69, |
2471 | with options \\"\$ac_cs_config\\" |
2472 | |
2473 | @@ -17360,7 +17441,7 @@ |
2474 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2475 | test -z "$DEPDIR" && continue |
2476 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2477 | - test -z "am__include" && continue |
2478 | + test -z "$am__include" && continue |
2479 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2480 | # Find all dependency output files, they are included files with |
2481 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2482 | |
2483 | === modified file 'configure.ac' |
2484 | --- configure.ac 2013-06-04 14:16:12 +0000 |
2485 | +++ configure.ac 2014-01-19 08:25:25 +0000 |
2486 | @@ -1,6 +1,6 @@ |
2487 | AC_PREREQ(2.65) |
2488 | |
2489 | -AC_INIT([gnome-packagekit],[3.8.2]) |
2490 | +AC_INIT([gnome-packagekit],[3.10.1]) |
2491 | AC_CONFIG_SRCDIR(src) |
2492 | AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar]) |
2493 | AC_CONFIG_HEADERS([config.h]) |
2494 | |
2495 | === modified file 'data/Makefile.am' |
2496 | --- data/Makefile.am 2012-03-28 01:59:22 +0000 |
2497 | +++ data/Makefile.am 2014-01-19 08:25:25 +0000 |
2498 | @@ -5,6 +5,11 @@ |
2499 | migrationdir = $(datadir)/GConf/gsettings |
2500 | dist_migration_DATA = org.gnome.packagekit.gschema.migrate |
2501 | |
2502 | +appdatadir = $(datadir)/appdata |
2503 | +dist_appdata_DATA = \ |
2504 | + gpk-application.appdata.xml \ |
2505 | + gpk-update-viewer.appdata.xml |
2506 | + |
2507 | @INTLTOOL_DESKTOP_RULE@ |
2508 | desktopdir = $(datadir)/applications |
2509 | desktop_in_files = \ |
2510 | |
2511 | === modified file 'data/Makefile.in' |
2512 | --- data/Makefile.in 2013-06-04 14:16:12 +0000 |
2513 | +++ data/Makefile.in 2014-01-19 08:25:25 +0000 |
2514 | @@ -1,7 +1,7 @@ |
2515 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
2516 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
2517 | # @configure_input@ |
2518 | |
2519 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2520 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2521 | |
2522 | # This Makefile.in is free software; the Free Software Foundation |
2523 | # gives unlimited permission to copy and/or distribute it, |
2524 | @@ -15,23 +15,51 @@ |
2525 | @SET_MAKE@ |
2526 | |
2527 | VPATH = @srcdir@ |
2528 | -am__make_dryrun = \ |
2529 | - { \ |
2530 | - am__dry=no; \ |
2531 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2532 | +am__make_running_with_option = \ |
2533 | + case $${target_option-} in \ |
2534 | + ?) ;; \ |
2535 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2536 | + "target option '$${target_option-}' specified" >&2; \ |
2537 | + exit 1;; \ |
2538 | + esac; \ |
2539 | + has_opt=no; \ |
2540 | + sane_makeflags=$$MAKEFLAGS; \ |
2541 | + if $(am__is_gnu_make); then \ |
2542 | + sane_makeflags=$$MFLAGS; \ |
2543 | + else \ |
2544 | case $$MAKEFLAGS in \ |
2545 | *\\[\ \ ]*) \ |
2546 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2547 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2548 | - *) \ |
2549 | - for am__flg in $$MAKEFLAGS; do \ |
2550 | - case $$am__flg in \ |
2551 | - *=*|--*) ;; \ |
2552 | - *n*) am__dry=yes; break;; \ |
2553 | - esac; \ |
2554 | - done;; \ |
2555 | - esac; \ |
2556 | - test $$am__dry = yes; \ |
2557 | - } |
2558 | + bs=\\; \ |
2559 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2560 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2561 | + esac; \ |
2562 | + fi; \ |
2563 | + skip_next=no; \ |
2564 | + strip_trailopt () \ |
2565 | + { \ |
2566 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2567 | + }; \ |
2568 | + for flg in $$sane_makeflags; do \ |
2569 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
2570 | + case $$flg in \ |
2571 | + *=*|--*) continue;; \ |
2572 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
2573 | + -*I?*) strip_trailopt 'I';; \ |
2574 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
2575 | + -*O?*) strip_trailopt 'O';; \ |
2576 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
2577 | + -*l?*) strip_trailopt 'l';; \ |
2578 | + -[dEDm]) skip_next=yes;; \ |
2579 | + -[JT]) skip_next=yes;; \ |
2580 | + esac; \ |
2581 | + case $$flg in \ |
2582 | + *$$target_option*) has_opt=yes; break;; \ |
2583 | + esac; \ |
2584 | + done; \ |
2585 | + test $$has_opt = yes |
2586 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
2587 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
2588 | pkgdatadir = $(datadir)/@PACKAGE@ |
2589 | pkgincludedir = $(includedir)/@PACKAGE@ |
2590 | pkglibdir = $(libdir)/@PACKAGE@ |
2591 | @@ -52,7 +80,7 @@ |
2592 | host_triplet = @host@ |
2593 | subdir = data |
2594 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2595 | - $(dist_migration_DATA) |
2596 | + $(dist_appdata_DATA) $(dist_migration_DATA) |
2597 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2598 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2599 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2600 | @@ -115,11 +143,11 @@ |
2601 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
2602 | $(am__cd) "$$dir" && rm -f $$files; }; \ |
2603 | } |
2604 | -am__installdirs = "$(DESTDIR)$(desktopdir)" \ |
2605 | +am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)" \ |
2606 | "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" \ |
2607 | "$(DESTDIR)$(servicedir)" |
2608 | -DATA = $(desktop_DATA) $(dist_migration_DATA) $(pkgdata_DATA) \ |
2609 | - $(service_DATA) |
2610 | +DATA = $(desktop_DATA) $(dist_appdata_DATA) $(dist_migration_DATA) \ |
2611 | + $(pkgdata_DATA) $(service_DATA) |
2612 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
2613 | distclean-recursive maintainer-clean-recursive |
2614 | am__recursive_targets = \ |
2615 | @@ -221,6 +249,7 @@ |
2616 | GREP = @GREP@ |
2617 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
2618 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
2619 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
2620 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
2621 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
2622 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
2623 | @@ -375,6 +404,11 @@ |
2624 | SUBDIRS = icons |
2625 | migrationdir = $(datadir)/GConf/gsettings |
2626 | dist_migration_DATA = org.gnome.packagekit.gschema.migrate |
2627 | +appdatadir = $(datadir)/appdata |
2628 | +dist_appdata_DATA = \ |
2629 | + gpk-application.appdata.xml \ |
2630 | + gpk-update-viewer.appdata.xml |
2631 | + |
2632 | desktopdir = $(datadir)/applications |
2633 | desktop_in_files = \ |
2634 | gpk-install-local-file.desktop.in \ |
2635 | @@ -486,6 +520,27 @@ |
2636 | @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ |
2637 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2638 | dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) |
2639 | +install-dist_appdataDATA: $(dist_appdata_DATA) |
2640 | + @$(NORMAL_INSTALL) |
2641 | + @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \ |
2642 | + if test -n "$$list"; then \ |
2643 | + echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ |
2644 | + $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \ |
2645 | + fi; \ |
2646 | + for p in $$list; do \ |
2647 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2648 | + echo "$$d$$p"; \ |
2649 | + done | $(am__base_list) | \ |
2650 | + while read files; do \ |
2651 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \ |
2652 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ |
2653 | + done |
2654 | + |
2655 | +uninstall-dist_appdataDATA: |
2656 | + @$(NORMAL_UNINSTALL) |
2657 | + @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \ |
2658 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2659 | + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) |
2660 | install-dist_migrationDATA: $(dist_migration_DATA) |
2661 | @$(NORMAL_INSTALL) |
2662 | @list='$(dist_migration_DATA)'; test -n "$(migrationdir)" || list=; \ |
2663 | @@ -557,13 +612,12 @@ |
2664 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
2665 | # (2) otherwise, pass the desired values on the 'make' command line. |
2666 | $(am__recursive_targets): |
2667 | - @fail= failcom='exit 1'; \ |
2668 | - for f in x $$MAKEFLAGS; do \ |
2669 | - case $$f in \ |
2670 | - *=* | --[!k]*);; \ |
2671 | - *k*) failcom='fail=yes';; \ |
2672 | - esac; \ |
2673 | - done; \ |
2674 | + @fail=; \ |
2675 | + if $(am__make_keepgoing); then \ |
2676 | + failcom='fail=yes'; \ |
2677 | + else \ |
2678 | + failcom='exit 1'; \ |
2679 | + fi; \ |
2680 | dot_seen=no; \ |
2681 | target=`echo $@ | sed s/-recursive//`; \ |
2682 | case "$@" in \ |
2683 | @@ -710,7 +764,7 @@ |
2684 | all-am: Makefile $(DATA) |
2685 | installdirs: installdirs-recursive |
2686 | installdirs-am: |
2687 | - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \ |
2688 | + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \ |
2689 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
2690 | done |
2691 | install: install-recursive |
2692 | @@ -764,8 +818,9 @@ |
2693 | |
2694 | info-am: |
2695 | |
2696 | -install-data-am: install-desktopDATA install-dist_migrationDATA \ |
2697 | - install-pkgdataDATA install-serviceDATA |
2698 | +install-data-am: install-desktopDATA install-dist_appdataDATA \ |
2699 | + install-dist_migrationDATA install-pkgdataDATA \ |
2700 | + install-serviceDATA |
2701 | |
2702 | install-dvi: install-dvi-recursive |
2703 | |
2704 | @@ -809,8 +864,9 @@ |
2705 | |
2706 | ps-am: |
2707 | |
2708 | -uninstall-am: uninstall-desktopDATA uninstall-dist_migrationDATA \ |
2709 | - uninstall-pkgdataDATA uninstall-serviceDATA |
2710 | +uninstall-am: uninstall-desktopDATA uninstall-dist_appdataDATA \ |
2711 | + uninstall-dist_migrationDATA uninstall-pkgdataDATA \ |
2712 | + uninstall-serviceDATA |
2713 | |
2714 | .MAKE: $(am__recursive_targets) install-am install-strip |
2715 | |
2716 | @@ -819,15 +875,16 @@ |
2717 | cscopelist-am ctags ctags-am distclean distclean-generic \ |
2718 | distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2719 | html-am info info-am install install-am install-data \ |
2720 | - install-data-am install-desktopDATA install-dist_migrationDATA \ |
2721 | - install-dvi install-dvi-am install-exec install-exec-am \ |
2722 | - install-html install-html-am install-info install-info-am \ |
2723 | - install-man install-pdf install-pdf-am install-pkgdataDATA \ |
2724 | - install-ps install-ps-am install-serviceDATA install-strip \ |
2725 | - installcheck installcheck-am installdirs installdirs-am \ |
2726 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
2727 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2728 | - tags tags-am uninstall uninstall-am uninstall-desktopDATA \ |
2729 | + install-data-am install-desktopDATA install-dist_appdataDATA \ |
2730 | + install-dist_migrationDATA install-dvi install-dvi-am \ |
2731 | + install-exec install-exec-am install-html install-html-am \ |
2732 | + install-info install-info-am install-man install-pdf \ |
2733 | + install-pdf-am install-pkgdataDATA install-ps install-ps-am \ |
2734 | + install-serviceDATA install-strip installcheck installcheck-am \ |
2735 | + installdirs installdirs-am maintainer-clean \ |
2736 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
2737 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
2738 | + uninstall-am uninstall-desktopDATA uninstall-dist_appdataDATA \ |
2739 | uninstall-dist_migrationDATA uninstall-pkgdataDATA \ |
2740 | uninstall-serviceDATA |
2741 | |
2742 | |
2743 | === added file 'data/gpk-application.appdata.xml' |
2744 | --- data/gpk-application.appdata.xml 1970-01-01 00:00:00 +0000 |
2745 | +++ data/gpk-application.appdata.xml 2014-01-19 08:25:25 +0000 |
2746 | @@ -0,0 +1,26 @@ |
2747 | +<?xml version="1.0" encoding="UTF-8"?> |
2748 | +<!-- Copyright 2013 Richard Hughes <richard@hughsie.com> --> |
2749 | +<application> |
2750 | + <id type="desktop">gpk-application.desktop</id> |
2751 | + <licence>CC0</licence> |
2752 | + <name>GNOME Package Installer</name> |
2753 | + <description> |
2754 | + <p> |
2755 | + Package Installer allows you to install and remove packages on your system. |
2756 | + You can view search packages by name, details or even file name and also |
2757 | + see dependencies of one package on other packages. |
2758 | + Searching by groups is possible and is an easy way to find software in |
2759 | + your favorite desktop environment. |
2760 | + </p> |
2761 | + <p> |
2762 | + Package Installer uses PackageKit and can work on any distribution using |
2763 | + the native package management framework. |
2764 | + </p> |
2765 | + </description> |
2766 | + <screenshots> |
2767 | + <screenshot type="default">https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-application.png</screenshot> |
2768 | + <screenshot>https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-application-details.png</screenshot> |
2769 | + </screenshots> |
2770 | + <url type="homepage">http://www.packagekit.org/</url> |
2771 | + <updatecontact>richard_at_hughsie.com</updatecontact> |
2772 | +</application> |
2773 | |
2774 | === modified file 'data/gpk-application.desktop.in' |
2775 | --- data/gpk-application.desktop.in 2013-06-04 14:16:12 +0000 |
2776 | +++ data/gpk-application.desktop.in 2014-01-19 08:25:25 +0000 |
2777 | @@ -1,11 +1,11 @@ |
2778 | [Desktop Entry] |
2779 | -_Name=Software |
2780 | +_Name=Packages |
2781 | _Comment=Add or remove software installed on the system |
2782 | Icon=system-software-install |
2783 | Exec=gpk-application |
2784 | Terminal=false |
2785 | Type=Application |
2786 | -Categories=GNOME;GTK;System; |
2787 | +Categories=GNOME;GTK;System;Settings;PackageManager; |
2788 | _Keywords=Updates;Upgrade;Sources;Repositories;Preferences;Install;Store; |
2789 | NotShowIn=KDE; |
2790 | StartupNotify=true |
2791 | |
2792 | === modified file 'data/gpk-application.ui' |
2793 | --- data/gpk-application.ui 2013-06-04 14:16:12 +0000 |
2794 | +++ data/gpk-application.ui 2014-01-19 08:25:25 +0000 |
2795 | @@ -325,7 +325,7 @@ |
2796 | <property name="visible">True</property> |
2797 | <property name="can_focus">False</property> |
2798 | <property name="xalign">1</property> |
2799 | - <property name="label" translatable="yes">Licence</property> |
2800 | + <property name="label" translatable="yes">License</property> |
2801 | <style> |
2802 | <class name="dim-label"/> |
2803 | </style> |
2804 | |
2805 | === added file 'data/gpk-update-viewer.appdata.xml' |
2806 | --- data/gpk-update-viewer.appdata.xml 1970-01-01 00:00:00 +0000 |
2807 | +++ data/gpk-update-viewer.appdata.xml 2014-01-19 08:25:25 +0000 |
2808 | @@ -0,0 +1,23 @@ |
2809 | +<?xml version="1.0" encoding="UTF-8"?> |
2810 | +<!-- Copyright 2013 Richard Hughes <richard@hughsie.com> --> |
2811 | +<application> |
2812 | + <id type="desktop">gpk-update-viewer.desktop</id> |
2813 | + <licence>CC0</licence> |
2814 | + <name>GNOME Package Updater</name> |
2815 | + <description> |
2816 | + <p> |
2817 | + Package Updater allows you to update packages on your system without |
2818 | + rebooting. |
2819 | + You can view details about each update and choose which updates to apply. |
2820 | + </p> |
2821 | + <p> |
2822 | + Package Updater uses PackageKit and can work on any distribution using |
2823 | + the native package management framework. |
2824 | + </p> |
2825 | + </description> |
2826 | + <screenshots> |
2827 | + <screenshot type="default">https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-updater.png</screenshot> |
2828 | + </screenshots> |
2829 | + <url type="homepage">http://www.packagekit.org/</url> |
2830 | + <updatecontact>richard_at_hughsie.com</updatecontact> |
2831 | +</application> |
2832 | |
2833 | === modified file 'data/gpk-update-viewer.ui' |
2834 | --- data/gpk-update-viewer.ui 2011-11-10 22:12:52 +0000 |
2835 | +++ data/gpk-update-viewer.ui 2014-01-19 08:25:25 +0000 |
2836 | @@ -234,6 +234,7 @@ |
2837 | <property name="can_focus">True</property> |
2838 | <child> |
2839 | <object class="GtkScrolledWindow" id="scrolledwindow_details"> |
2840 | + <property name="height_request">100</property> |
2841 | <property name="visible">True</property> |
2842 | <property name="can_focus">True</property> |
2843 | <property name="shadow_type">in</property> |
2844 | |
2845 | === modified file 'data/icons/16x16/Makefile.in' |
2846 | --- data/icons/16x16/Makefile.in 2013-06-04 14:16:12 +0000 |
2847 | +++ data/icons/16x16/Makefile.in 2014-01-19 08:25:25 +0000 |
2848 | @@ -1,7 +1,7 @@ |
2849 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
2850 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
2851 | # @configure_input@ |
2852 | |
2853 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2854 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2855 | |
2856 | # This Makefile.in is free software; the Free Software Foundation |
2857 | # gives unlimited permission to copy and/or distribute it, |
2858 | @@ -14,23 +14,51 @@ |
2859 | |
2860 | @SET_MAKE@ |
2861 | VPATH = @srcdir@ |
2862 | -am__make_dryrun = \ |
2863 | - { \ |
2864 | - am__dry=no; \ |
2865 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2866 | +am__make_running_with_option = \ |
2867 | + case $${target_option-} in \ |
2868 | + ?) ;; \ |
2869 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2870 | + "target option '$${target_option-}' specified" >&2; \ |
2871 | + exit 1;; \ |
2872 | + esac; \ |
2873 | + has_opt=no; \ |
2874 | + sane_makeflags=$$MAKEFLAGS; \ |
2875 | + if $(am__is_gnu_make); then \ |
2876 | + sane_makeflags=$$MFLAGS; \ |
2877 | + else \ |
2878 | case $$MAKEFLAGS in \ |
2879 | *\\[\ \ ]*) \ |
2880 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2881 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2882 | - *) \ |
2883 | - for am__flg in $$MAKEFLAGS; do \ |
2884 | - case $$am__flg in \ |
2885 | - *=*|--*) ;; \ |
2886 | - *n*) am__dry=yes; break;; \ |
2887 | - esac; \ |
2888 | - done;; \ |
2889 | - esac; \ |
2890 | - test $$am__dry = yes; \ |
2891 | - } |
2892 | + bs=\\; \ |
2893 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2894 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2895 | + esac; \ |
2896 | + fi; \ |
2897 | + skip_next=no; \ |
2898 | + strip_trailopt () \ |
2899 | + { \ |
2900 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2901 | + }; \ |
2902 | + for flg in $$sane_makeflags; do \ |
2903 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
2904 | + case $$flg in \ |
2905 | + *=*|--*) continue;; \ |
2906 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
2907 | + -*I?*) strip_trailopt 'I';; \ |
2908 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
2909 | + -*O?*) strip_trailopt 'O';; \ |
2910 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
2911 | + -*l?*) strip_trailopt 'l';; \ |
2912 | + -[dEDm]) skip_next=yes;; \ |
2913 | + -[JT]) skip_next=yes;; \ |
2914 | + esac; \ |
2915 | + case $$flg in \ |
2916 | + *$$target_option*) has_opt=yes; break;; \ |
2917 | + esac; \ |
2918 | + done; \ |
2919 | + test $$has_opt = yes |
2920 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
2921 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
2922 | pkgdatadir = $(datadir)/@PACKAGE@ |
2923 | pkgincludedir = $(includedir)/@PACKAGE@ |
2924 | pkglibdir = $(libdir)/@PACKAGE@ |
2925 | @@ -187,6 +215,7 @@ |
2926 | GREP = @GREP@ |
2927 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
2928 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
2929 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
2930 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
2931 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
2932 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
2933 | @@ -385,13 +414,12 @@ |
2934 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
2935 | # (2) otherwise, pass the desired values on the 'make' command line. |
2936 | $(am__recursive_targets): |
2937 | - @fail= failcom='exit 1'; \ |
2938 | - for f in x $$MAKEFLAGS; do \ |
2939 | - case $$f in \ |
2940 | - *=* | --[!k]*);; \ |
2941 | - *k*) failcom='fail=yes';; \ |
2942 | - esac; \ |
2943 | - done; \ |
2944 | + @fail=; \ |
2945 | + if $(am__make_keepgoing); then \ |
2946 | + failcom='fail=yes'; \ |
2947 | + else \ |
2948 | + failcom='exit 1'; \ |
2949 | + fi; \ |
2950 | dot_seen=no; \ |
2951 | target=`echo $@ | sed s/-recursive//`; \ |
2952 | case "$@" in \ |
2953 | |
2954 | === modified file 'data/icons/16x16/animations/Makefile.in' |
2955 | --- data/icons/16x16/animations/Makefile.in 2013-06-04 14:16:12 +0000 |
2956 | +++ data/icons/16x16/animations/Makefile.in 2014-01-19 08:25:25 +0000 |
2957 | @@ -1,7 +1,7 @@ |
2958 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
2959 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
2960 | # @configure_input@ |
2961 | |
2962 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2963 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2964 | |
2965 | # This Makefile.in is free software; the Free Software Foundation |
2966 | # gives unlimited permission to copy and/or distribute it, |
2967 | @@ -15,23 +15,51 @@ |
2968 | @SET_MAKE@ |
2969 | |
2970 | VPATH = @srcdir@ |
2971 | -am__make_dryrun = \ |
2972 | - { \ |
2973 | - am__dry=no; \ |
2974 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2975 | +am__make_running_with_option = \ |
2976 | + case $${target_option-} in \ |
2977 | + ?) ;; \ |
2978 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2979 | + "target option '$${target_option-}' specified" >&2; \ |
2980 | + exit 1;; \ |
2981 | + esac; \ |
2982 | + has_opt=no; \ |
2983 | + sane_makeflags=$$MAKEFLAGS; \ |
2984 | + if $(am__is_gnu_make); then \ |
2985 | + sane_makeflags=$$MFLAGS; \ |
2986 | + else \ |
2987 | case $$MAKEFLAGS in \ |
2988 | *\\[\ \ ]*) \ |
2989 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2990 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2991 | - *) \ |
2992 | - for am__flg in $$MAKEFLAGS; do \ |
2993 | - case $$am__flg in \ |
2994 | - *=*|--*) ;; \ |
2995 | - *n*) am__dry=yes; break;; \ |
2996 | - esac; \ |
2997 | - done;; \ |
2998 | - esac; \ |
2999 | - test $$am__dry = yes; \ |
3000 | - } |
3001 | + bs=\\; \ |
3002 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3003 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3004 | + esac; \ |
3005 | + fi; \ |
3006 | + skip_next=no; \ |
3007 | + strip_trailopt () \ |
3008 | + { \ |
3009 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3010 | + }; \ |
3011 | + for flg in $$sane_makeflags; do \ |
3012 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3013 | + case $$flg in \ |
3014 | + *=*|--*) continue;; \ |
3015 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3016 | + -*I?*) strip_trailopt 'I';; \ |
3017 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3018 | + -*O?*) strip_trailopt 'O';; \ |
3019 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3020 | + -*l?*) strip_trailopt 'l';; \ |
3021 | + -[dEDm]) skip_next=yes;; \ |
3022 | + -[JT]) skip_next=yes;; \ |
3023 | + esac; \ |
3024 | + case $$flg in \ |
3025 | + *$$target_option*) has_opt=yes; break;; \ |
3026 | + esac; \ |
3027 | + done; \ |
3028 | + test $$has_opt = yes |
3029 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3030 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3031 | pkgdatadir = $(datadir)/@PACKAGE@ |
3032 | pkgincludedir = $(includedir)/@PACKAGE@ |
3033 | pkglibdir = $(libdir)/@PACKAGE@ |
3034 | @@ -157,6 +185,7 @@ |
3035 | GREP = @GREP@ |
3036 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3037 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3038 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3039 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3040 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3041 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3042 | |
3043 | === modified file 'data/icons/16x16/categories/Makefile.in' |
3044 | --- data/icons/16x16/categories/Makefile.in 2013-06-04 14:16:12 +0000 |
3045 | +++ data/icons/16x16/categories/Makefile.in 2014-01-19 08:25:25 +0000 |
3046 | @@ -1,7 +1,7 @@ |
3047 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3048 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3049 | # @configure_input@ |
3050 | |
3051 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3052 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3053 | |
3054 | # This Makefile.in is free software; the Free Software Foundation |
3055 | # gives unlimited permission to copy and/or distribute it, |
3056 | @@ -15,23 +15,51 @@ |
3057 | @SET_MAKE@ |
3058 | |
3059 | VPATH = @srcdir@ |
3060 | -am__make_dryrun = \ |
3061 | - { \ |
3062 | - am__dry=no; \ |
3063 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3064 | +am__make_running_with_option = \ |
3065 | + case $${target_option-} in \ |
3066 | + ?) ;; \ |
3067 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3068 | + "target option '$${target_option-}' specified" >&2; \ |
3069 | + exit 1;; \ |
3070 | + esac; \ |
3071 | + has_opt=no; \ |
3072 | + sane_makeflags=$$MAKEFLAGS; \ |
3073 | + if $(am__is_gnu_make); then \ |
3074 | + sane_makeflags=$$MFLAGS; \ |
3075 | + else \ |
3076 | case $$MAKEFLAGS in \ |
3077 | *\\[\ \ ]*) \ |
3078 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3079 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3080 | - *) \ |
3081 | - for am__flg in $$MAKEFLAGS; do \ |
3082 | - case $$am__flg in \ |
3083 | - *=*|--*) ;; \ |
3084 | - *n*) am__dry=yes; break;; \ |
3085 | - esac; \ |
3086 | - done;; \ |
3087 | - esac; \ |
3088 | - test $$am__dry = yes; \ |
3089 | - } |
3090 | + bs=\\; \ |
3091 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3092 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3093 | + esac; \ |
3094 | + fi; \ |
3095 | + skip_next=no; \ |
3096 | + strip_trailopt () \ |
3097 | + { \ |
3098 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3099 | + }; \ |
3100 | + for flg in $$sane_makeflags; do \ |
3101 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3102 | + case $$flg in \ |
3103 | + *=*|--*) continue;; \ |
3104 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3105 | + -*I?*) strip_trailopt 'I';; \ |
3106 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3107 | + -*O?*) strip_trailopt 'O';; \ |
3108 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3109 | + -*l?*) strip_trailopt 'l';; \ |
3110 | + -[dEDm]) skip_next=yes;; \ |
3111 | + -[JT]) skip_next=yes;; \ |
3112 | + esac; \ |
3113 | + case $$flg in \ |
3114 | + *$$target_option*) has_opt=yes; break;; \ |
3115 | + esac; \ |
3116 | + done; \ |
3117 | + test $$has_opt = yes |
3118 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3119 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3120 | pkgdatadir = $(datadir)/@PACKAGE@ |
3121 | pkgincludedir = $(includedir)/@PACKAGE@ |
3122 | pkglibdir = $(libdir)/@PACKAGE@ |
3123 | @@ -157,6 +185,7 @@ |
3124 | GREP = @GREP@ |
3125 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3126 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3127 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3128 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3129 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3130 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3131 | |
3132 | === modified file 'data/icons/16x16/status/Makefile.in' |
3133 | --- data/icons/16x16/status/Makefile.in 2013-06-04 14:16:12 +0000 |
3134 | +++ data/icons/16x16/status/Makefile.in 2014-01-19 08:25:25 +0000 |
3135 | @@ -1,7 +1,7 @@ |
3136 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3137 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3138 | # @configure_input@ |
3139 | |
3140 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3141 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3142 | |
3143 | # This Makefile.in is free software; the Free Software Foundation |
3144 | # gives unlimited permission to copy and/or distribute it, |
3145 | @@ -15,23 +15,51 @@ |
3146 | @SET_MAKE@ |
3147 | |
3148 | VPATH = @srcdir@ |
3149 | -am__make_dryrun = \ |
3150 | - { \ |
3151 | - am__dry=no; \ |
3152 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3153 | +am__make_running_with_option = \ |
3154 | + case $${target_option-} in \ |
3155 | + ?) ;; \ |
3156 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3157 | + "target option '$${target_option-}' specified" >&2; \ |
3158 | + exit 1;; \ |
3159 | + esac; \ |
3160 | + has_opt=no; \ |
3161 | + sane_makeflags=$$MAKEFLAGS; \ |
3162 | + if $(am__is_gnu_make); then \ |
3163 | + sane_makeflags=$$MFLAGS; \ |
3164 | + else \ |
3165 | case $$MAKEFLAGS in \ |
3166 | *\\[\ \ ]*) \ |
3167 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3168 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3169 | - *) \ |
3170 | - for am__flg in $$MAKEFLAGS; do \ |
3171 | - case $$am__flg in \ |
3172 | - *=*|--*) ;; \ |
3173 | - *n*) am__dry=yes; break;; \ |
3174 | - esac; \ |
3175 | - done;; \ |
3176 | - esac; \ |
3177 | - test $$am__dry = yes; \ |
3178 | - } |
3179 | + bs=\\; \ |
3180 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3181 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3182 | + esac; \ |
3183 | + fi; \ |
3184 | + skip_next=no; \ |
3185 | + strip_trailopt () \ |
3186 | + { \ |
3187 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3188 | + }; \ |
3189 | + for flg in $$sane_makeflags; do \ |
3190 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3191 | + case $$flg in \ |
3192 | + *=*|--*) continue;; \ |
3193 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3194 | + -*I?*) strip_trailopt 'I';; \ |
3195 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3196 | + -*O?*) strip_trailopt 'O';; \ |
3197 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3198 | + -*l?*) strip_trailopt 'l';; \ |
3199 | + -[dEDm]) skip_next=yes;; \ |
3200 | + -[JT]) skip_next=yes;; \ |
3201 | + esac; \ |
3202 | + case $$flg in \ |
3203 | + *$$target_option*) has_opt=yes; break;; \ |
3204 | + esac; \ |
3205 | + done; \ |
3206 | + test $$has_opt = yes |
3207 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3208 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3209 | pkgdatadir = $(datadir)/@PACKAGE@ |
3210 | pkgincludedir = $(includedir)/@PACKAGE@ |
3211 | pkglibdir = $(libdir)/@PACKAGE@ |
3212 | @@ -157,6 +185,7 @@ |
3213 | GREP = @GREP@ |
3214 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3215 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3216 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3217 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3218 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3219 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3220 | |
3221 | === modified file 'data/icons/22x22/Makefile.in' |
3222 | --- data/icons/22x22/Makefile.in 2013-06-04 14:16:12 +0000 |
3223 | +++ data/icons/22x22/Makefile.in 2014-01-19 08:25:25 +0000 |
3224 | @@ -1,7 +1,7 @@ |
3225 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3226 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3227 | # @configure_input@ |
3228 | |
3229 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3230 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3231 | |
3232 | # This Makefile.in is free software; the Free Software Foundation |
3233 | # gives unlimited permission to copy and/or distribute it, |
3234 | @@ -14,23 +14,51 @@ |
3235 | |
3236 | @SET_MAKE@ |
3237 | VPATH = @srcdir@ |
3238 | -am__make_dryrun = \ |
3239 | - { \ |
3240 | - am__dry=no; \ |
3241 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3242 | +am__make_running_with_option = \ |
3243 | + case $${target_option-} in \ |
3244 | + ?) ;; \ |
3245 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3246 | + "target option '$${target_option-}' specified" >&2; \ |
3247 | + exit 1;; \ |
3248 | + esac; \ |
3249 | + has_opt=no; \ |
3250 | + sane_makeflags=$$MAKEFLAGS; \ |
3251 | + if $(am__is_gnu_make); then \ |
3252 | + sane_makeflags=$$MFLAGS; \ |
3253 | + else \ |
3254 | case $$MAKEFLAGS in \ |
3255 | *\\[\ \ ]*) \ |
3256 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3257 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3258 | - *) \ |
3259 | - for am__flg in $$MAKEFLAGS; do \ |
3260 | - case $$am__flg in \ |
3261 | - *=*|--*) ;; \ |
3262 | - *n*) am__dry=yes; break;; \ |
3263 | - esac; \ |
3264 | - done;; \ |
3265 | - esac; \ |
3266 | - test $$am__dry = yes; \ |
3267 | - } |
3268 | + bs=\\; \ |
3269 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3270 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3271 | + esac; \ |
3272 | + fi; \ |
3273 | + skip_next=no; \ |
3274 | + strip_trailopt () \ |
3275 | + { \ |
3276 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3277 | + }; \ |
3278 | + for flg in $$sane_makeflags; do \ |
3279 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3280 | + case $$flg in \ |
3281 | + *=*|--*) continue;; \ |
3282 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3283 | + -*I?*) strip_trailopt 'I';; \ |
3284 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3285 | + -*O?*) strip_trailopt 'O';; \ |
3286 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3287 | + -*l?*) strip_trailopt 'l';; \ |
3288 | + -[dEDm]) skip_next=yes;; \ |
3289 | + -[JT]) skip_next=yes;; \ |
3290 | + esac; \ |
3291 | + case $$flg in \ |
3292 | + *$$target_option*) has_opt=yes; break;; \ |
3293 | + esac; \ |
3294 | + done; \ |
3295 | + test $$has_opt = yes |
3296 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3297 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3298 | pkgdatadir = $(datadir)/@PACKAGE@ |
3299 | pkgincludedir = $(includedir)/@PACKAGE@ |
3300 | pkglibdir = $(libdir)/@PACKAGE@ |
3301 | @@ -187,6 +215,7 @@ |
3302 | GREP = @GREP@ |
3303 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3304 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3305 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3306 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3307 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3308 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3309 | @@ -385,13 +414,12 @@ |
3310 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
3311 | # (2) otherwise, pass the desired values on the 'make' command line. |
3312 | $(am__recursive_targets): |
3313 | - @fail= failcom='exit 1'; \ |
3314 | - for f in x $$MAKEFLAGS; do \ |
3315 | - case $$f in \ |
3316 | - *=* | --[!k]*);; \ |
3317 | - *k*) failcom='fail=yes';; \ |
3318 | - esac; \ |
3319 | - done; \ |
3320 | + @fail=; \ |
3321 | + if $(am__make_keepgoing); then \ |
3322 | + failcom='fail=yes'; \ |
3323 | + else \ |
3324 | + failcom='exit 1'; \ |
3325 | + fi; \ |
3326 | dot_seen=no; \ |
3327 | target=`echo $@ | sed s/-recursive//`; \ |
3328 | case "$@" in \ |
3329 | |
3330 | === modified file 'data/icons/22x22/animations/Makefile.in' |
3331 | --- data/icons/22x22/animations/Makefile.in 2013-06-04 14:16:12 +0000 |
3332 | +++ data/icons/22x22/animations/Makefile.in 2014-01-19 08:25:25 +0000 |
3333 | @@ -1,7 +1,7 @@ |
3334 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3335 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3336 | # @configure_input@ |
3337 | |
3338 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3339 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3340 | |
3341 | # This Makefile.in is free software; the Free Software Foundation |
3342 | # gives unlimited permission to copy and/or distribute it, |
3343 | @@ -15,23 +15,51 @@ |
3344 | @SET_MAKE@ |
3345 | |
3346 | VPATH = @srcdir@ |
3347 | -am__make_dryrun = \ |
3348 | - { \ |
3349 | - am__dry=no; \ |
3350 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3351 | +am__make_running_with_option = \ |
3352 | + case $${target_option-} in \ |
3353 | + ?) ;; \ |
3354 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3355 | + "target option '$${target_option-}' specified" >&2; \ |
3356 | + exit 1;; \ |
3357 | + esac; \ |
3358 | + has_opt=no; \ |
3359 | + sane_makeflags=$$MAKEFLAGS; \ |
3360 | + if $(am__is_gnu_make); then \ |
3361 | + sane_makeflags=$$MFLAGS; \ |
3362 | + else \ |
3363 | case $$MAKEFLAGS in \ |
3364 | *\\[\ \ ]*) \ |
3365 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3366 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3367 | - *) \ |
3368 | - for am__flg in $$MAKEFLAGS; do \ |
3369 | - case $$am__flg in \ |
3370 | - *=*|--*) ;; \ |
3371 | - *n*) am__dry=yes; break;; \ |
3372 | - esac; \ |
3373 | - done;; \ |
3374 | - esac; \ |
3375 | - test $$am__dry = yes; \ |
3376 | - } |
3377 | + bs=\\; \ |
3378 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3379 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3380 | + esac; \ |
3381 | + fi; \ |
3382 | + skip_next=no; \ |
3383 | + strip_trailopt () \ |
3384 | + { \ |
3385 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3386 | + }; \ |
3387 | + for flg in $$sane_makeflags; do \ |
3388 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3389 | + case $$flg in \ |
3390 | + *=*|--*) continue;; \ |
3391 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3392 | + -*I?*) strip_trailopt 'I';; \ |
3393 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3394 | + -*O?*) strip_trailopt 'O';; \ |
3395 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3396 | + -*l?*) strip_trailopt 'l';; \ |
3397 | + -[dEDm]) skip_next=yes;; \ |
3398 | + -[JT]) skip_next=yes;; \ |
3399 | + esac; \ |
3400 | + case $$flg in \ |
3401 | + *$$target_option*) has_opt=yes; break;; \ |
3402 | + esac; \ |
3403 | + done; \ |
3404 | + test $$has_opt = yes |
3405 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3406 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3407 | pkgdatadir = $(datadir)/@PACKAGE@ |
3408 | pkgincludedir = $(includedir)/@PACKAGE@ |
3409 | pkglibdir = $(libdir)/@PACKAGE@ |
3410 | @@ -157,6 +185,7 @@ |
3411 | GREP = @GREP@ |
3412 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3413 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3414 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3415 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3416 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3417 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3418 | |
3419 | === modified file 'data/icons/22x22/categories/Makefile.in' |
3420 | --- data/icons/22x22/categories/Makefile.in 2013-06-04 14:16:12 +0000 |
3421 | +++ data/icons/22x22/categories/Makefile.in 2014-01-19 08:25:25 +0000 |
3422 | @@ -1,7 +1,7 @@ |
3423 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3424 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3425 | # @configure_input@ |
3426 | |
3427 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3428 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3429 | |
3430 | # This Makefile.in is free software; the Free Software Foundation |
3431 | # gives unlimited permission to copy and/or distribute it, |
3432 | @@ -15,23 +15,51 @@ |
3433 | @SET_MAKE@ |
3434 | |
3435 | VPATH = @srcdir@ |
3436 | -am__make_dryrun = \ |
3437 | - { \ |
3438 | - am__dry=no; \ |
3439 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3440 | +am__make_running_with_option = \ |
3441 | + case $${target_option-} in \ |
3442 | + ?) ;; \ |
3443 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3444 | + "target option '$${target_option-}' specified" >&2; \ |
3445 | + exit 1;; \ |
3446 | + esac; \ |
3447 | + has_opt=no; \ |
3448 | + sane_makeflags=$$MAKEFLAGS; \ |
3449 | + if $(am__is_gnu_make); then \ |
3450 | + sane_makeflags=$$MFLAGS; \ |
3451 | + else \ |
3452 | case $$MAKEFLAGS in \ |
3453 | *\\[\ \ ]*) \ |
3454 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3455 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3456 | - *) \ |
3457 | - for am__flg in $$MAKEFLAGS; do \ |
3458 | - case $$am__flg in \ |
3459 | - *=*|--*) ;; \ |
3460 | - *n*) am__dry=yes; break;; \ |
3461 | - esac; \ |
3462 | - done;; \ |
3463 | - esac; \ |
3464 | - test $$am__dry = yes; \ |
3465 | - } |
3466 | + bs=\\; \ |
3467 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3468 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3469 | + esac; \ |
3470 | + fi; \ |
3471 | + skip_next=no; \ |
3472 | + strip_trailopt () \ |
3473 | + { \ |
3474 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3475 | + }; \ |
3476 | + for flg in $$sane_makeflags; do \ |
3477 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3478 | + case $$flg in \ |
3479 | + *=*|--*) continue;; \ |
3480 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3481 | + -*I?*) strip_trailopt 'I';; \ |
3482 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3483 | + -*O?*) strip_trailopt 'O';; \ |
3484 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3485 | + -*l?*) strip_trailopt 'l';; \ |
3486 | + -[dEDm]) skip_next=yes;; \ |
3487 | + -[JT]) skip_next=yes;; \ |
3488 | + esac; \ |
3489 | + case $$flg in \ |
3490 | + *$$target_option*) has_opt=yes; break;; \ |
3491 | + esac; \ |
3492 | + done; \ |
3493 | + test $$has_opt = yes |
3494 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3495 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3496 | pkgdatadir = $(datadir)/@PACKAGE@ |
3497 | pkgincludedir = $(includedir)/@PACKAGE@ |
3498 | pkglibdir = $(libdir)/@PACKAGE@ |
3499 | @@ -157,6 +185,7 @@ |
3500 | GREP = @GREP@ |
3501 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3502 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3503 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3504 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3505 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3506 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3507 | |
3508 | === modified file 'data/icons/22x22/status/Makefile.in' |
3509 | --- data/icons/22x22/status/Makefile.in 2013-06-04 14:16:12 +0000 |
3510 | +++ data/icons/22x22/status/Makefile.in 2014-01-19 08:25:25 +0000 |
3511 | @@ -1,7 +1,7 @@ |
3512 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3513 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3514 | # @configure_input@ |
3515 | |
3516 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3517 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3518 | |
3519 | # This Makefile.in is free software; the Free Software Foundation |
3520 | # gives unlimited permission to copy and/or distribute it, |
3521 | @@ -15,23 +15,51 @@ |
3522 | @SET_MAKE@ |
3523 | |
3524 | VPATH = @srcdir@ |
3525 | -am__make_dryrun = \ |
3526 | - { \ |
3527 | - am__dry=no; \ |
3528 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3529 | +am__make_running_with_option = \ |
3530 | + case $${target_option-} in \ |
3531 | + ?) ;; \ |
3532 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3533 | + "target option '$${target_option-}' specified" >&2; \ |
3534 | + exit 1;; \ |
3535 | + esac; \ |
3536 | + has_opt=no; \ |
3537 | + sane_makeflags=$$MAKEFLAGS; \ |
3538 | + if $(am__is_gnu_make); then \ |
3539 | + sane_makeflags=$$MFLAGS; \ |
3540 | + else \ |
3541 | case $$MAKEFLAGS in \ |
3542 | *\\[\ \ ]*) \ |
3543 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3544 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3545 | - *) \ |
3546 | - for am__flg in $$MAKEFLAGS; do \ |
3547 | - case $$am__flg in \ |
3548 | - *=*|--*) ;; \ |
3549 | - *n*) am__dry=yes; break;; \ |
3550 | - esac; \ |
3551 | - done;; \ |
3552 | - esac; \ |
3553 | - test $$am__dry = yes; \ |
3554 | - } |
3555 | + bs=\\; \ |
3556 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3557 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3558 | + esac; \ |
3559 | + fi; \ |
3560 | + skip_next=no; \ |
3561 | + strip_trailopt () \ |
3562 | + { \ |
3563 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3564 | + }; \ |
3565 | + for flg in $$sane_makeflags; do \ |
3566 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3567 | + case $$flg in \ |
3568 | + *=*|--*) continue;; \ |
3569 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3570 | + -*I?*) strip_trailopt 'I';; \ |
3571 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3572 | + -*O?*) strip_trailopt 'O';; \ |
3573 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3574 | + -*l?*) strip_trailopt 'l';; \ |
3575 | + -[dEDm]) skip_next=yes;; \ |
3576 | + -[JT]) skip_next=yes;; \ |
3577 | + esac; \ |
3578 | + case $$flg in \ |
3579 | + *$$target_option*) has_opt=yes; break;; \ |
3580 | + esac; \ |
3581 | + done; \ |
3582 | + test $$has_opt = yes |
3583 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3584 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3585 | pkgdatadir = $(datadir)/@PACKAGE@ |
3586 | pkgincludedir = $(includedir)/@PACKAGE@ |
3587 | pkglibdir = $(libdir)/@PACKAGE@ |
3588 | @@ -157,6 +185,7 @@ |
3589 | GREP = @GREP@ |
3590 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3591 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3592 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3593 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3594 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3595 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3596 | |
3597 | === modified file 'data/icons/24x24/Makefile.in' |
3598 | --- data/icons/24x24/Makefile.in 2013-06-04 14:16:12 +0000 |
3599 | +++ data/icons/24x24/Makefile.in 2014-01-19 08:25:25 +0000 |
3600 | @@ -1,7 +1,7 @@ |
3601 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3602 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3603 | # @configure_input@ |
3604 | |
3605 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3606 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3607 | |
3608 | # This Makefile.in is free software; the Free Software Foundation |
3609 | # gives unlimited permission to copy and/or distribute it, |
3610 | @@ -14,23 +14,51 @@ |
3611 | |
3612 | @SET_MAKE@ |
3613 | VPATH = @srcdir@ |
3614 | -am__make_dryrun = \ |
3615 | - { \ |
3616 | - am__dry=no; \ |
3617 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3618 | +am__make_running_with_option = \ |
3619 | + case $${target_option-} in \ |
3620 | + ?) ;; \ |
3621 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3622 | + "target option '$${target_option-}' specified" >&2; \ |
3623 | + exit 1;; \ |
3624 | + esac; \ |
3625 | + has_opt=no; \ |
3626 | + sane_makeflags=$$MAKEFLAGS; \ |
3627 | + if $(am__is_gnu_make); then \ |
3628 | + sane_makeflags=$$MFLAGS; \ |
3629 | + else \ |
3630 | case $$MAKEFLAGS in \ |
3631 | *\\[\ \ ]*) \ |
3632 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3633 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3634 | - *) \ |
3635 | - for am__flg in $$MAKEFLAGS; do \ |
3636 | - case $$am__flg in \ |
3637 | - *=*|--*) ;; \ |
3638 | - *n*) am__dry=yes; break;; \ |
3639 | - esac; \ |
3640 | - done;; \ |
3641 | - esac; \ |
3642 | - test $$am__dry = yes; \ |
3643 | - } |
3644 | + bs=\\; \ |
3645 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3646 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3647 | + esac; \ |
3648 | + fi; \ |
3649 | + skip_next=no; \ |
3650 | + strip_trailopt () \ |
3651 | + { \ |
3652 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3653 | + }; \ |
3654 | + for flg in $$sane_makeflags; do \ |
3655 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3656 | + case $$flg in \ |
3657 | + *=*|--*) continue;; \ |
3658 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3659 | + -*I?*) strip_trailopt 'I';; \ |
3660 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3661 | + -*O?*) strip_trailopt 'O';; \ |
3662 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3663 | + -*l?*) strip_trailopt 'l';; \ |
3664 | + -[dEDm]) skip_next=yes;; \ |
3665 | + -[JT]) skip_next=yes;; \ |
3666 | + esac; \ |
3667 | + case $$flg in \ |
3668 | + *$$target_option*) has_opt=yes; break;; \ |
3669 | + esac; \ |
3670 | + done; \ |
3671 | + test $$has_opt = yes |
3672 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3673 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3674 | pkgdatadir = $(datadir)/@PACKAGE@ |
3675 | pkgincludedir = $(includedir)/@PACKAGE@ |
3676 | pkglibdir = $(libdir)/@PACKAGE@ |
3677 | @@ -187,6 +215,7 @@ |
3678 | GREP = @GREP@ |
3679 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3680 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3681 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3682 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3683 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3684 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3685 | @@ -385,13 +414,12 @@ |
3686 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
3687 | # (2) otherwise, pass the desired values on the 'make' command line. |
3688 | $(am__recursive_targets): |
3689 | - @fail= failcom='exit 1'; \ |
3690 | - for f in x $$MAKEFLAGS; do \ |
3691 | - case $$f in \ |
3692 | - *=* | --[!k]*);; \ |
3693 | - *k*) failcom='fail=yes';; \ |
3694 | - esac; \ |
3695 | - done; \ |
3696 | + @fail=; \ |
3697 | + if $(am__make_keepgoing); then \ |
3698 | + failcom='fail=yes'; \ |
3699 | + else \ |
3700 | + failcom='exit 1'; \ |
3701 | + fi; \ |
3702 | dot_seen=no; \ |
3703 | target=`echo $@ | sed s/-recursive//`; \ |
3704 | case "$@" in \ |
3705 | |
3706 | === modified file 'data/icons/24x24/animations/Makefile.in' |
3707 | --- data/icons/24x24/animations/Makefile.in 2013-06-04 14:16:12 +0000 |
3708 | +++ data/icons/24x24/animations/Makefile.in 2014-01-19 08:25:25 +0000 |
3709 | @@ -1,7 +1,7 @@ |
3710 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3711 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3712 | # @configure_input@ |
3713 | |
3714 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3715 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3716 | |
3717 | # This Makefile.in is free software; the Free Software Foundation |
3718 | # gives unlimited permission to copy and/or distribute it, |
3719 | @@ -15,23 +15,51 @@ |
3720 | @SET_MAKE@ |
3721 | |
3722 | VPATH = @srcdir@ |
3723 | -am__make_dryrun = \ |
3724 | - { \ |
3725 | - am__dry=no; \ |
3726 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3727 | +am__make_running_with_option = \ |
3728 | + case $${target_option-} in \ |
3729 | + ?) ;; \ |
3730 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3731 | + "target option '$${target_option-}' specified" >&2; \ |
3732 | + exit 1;; \ |
3733 | + esac; \ |
3734 | + has_opt=no; \ |
3735 | + sane_makeflags=$$MAKEFLAGS; \ |
3736 | + if $(am__is_gnu_make); then \ |
3737 | + sane_makeflags=$$MFLAGS; \ |
3738 | + else \ |
3739 | case $$MAKEFLAGS in \ |
3740 | *\\[\ \ ]*) \ |
3741 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3742 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3743 | - *) \ |
3744 | - for am__flg in $$MAKEFLAGS; do \ |
3745 | - case $$am__flg in \ |
3746 | - *=*|--*) ;; \ |
3747 | - *n*) am__dry=yes; break;; \ |
3748 | - esac; \ |
3749 | - done;; \ |
3750 | - esac; \ |
3751 | - test $$am__dry = yes; \ |
3752 | - } |
3753 | + bs=\\; \ |
3754 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3755 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3756 | + esac; \ |
3757 | + fi; \ |
3758 | + skip_next=no; \ |
3759 | + strip_trailopt () \ |
3760 | + { \ |
3761 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3762 | + }; \ |
3763 | + for flg in $$sane_makeflags; do \ |
3764 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3765 | + case $$flg in \ |
3766 | + *=*|--*) continue;; \ |
3767 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3768 | + -*I?*) strip_trailopt 'I';; \ |
3769 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3770 | + -*O?*) strip_trailopt 'O';; \ |
3771 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3772 | + -*l?*) strip_trailopt 'l';; \ |
3773 | + -[dEDm]) skip_next=yes;; \ |
3774 | + -[JT]) skip_next=yes;; \ |
3775 | + esac; \ |
3776 | + case $$flg in \ |
3777 | + *$$target_option*) has_opt=yes; break;; \ |
3778 | + esac; \ |
3779 | + done; \ |
3780 | + test $$has_opt = yes |
3781 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3782 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3783 | pkgdatadir = $(datadir)/@PACKAGE@ |
3784 | pkgincludedir = $(includedir)/@PACKAGE@ |
3785 | pkglibdir = $(libdir)/@PACKAGE@ |
3786 | @@ -157,6 +185,7 @@ |
3787 | GREP = @GREP@ |
3788 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3789 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3790 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3791 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3792 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3793 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3794 | |
3795 | === modified file 'data/icons/24x24/categories/Makefile.in' |
3796 | --- data/icons/24x24/categories/Makefile.in 2013-06-04 14:16:12 +0000 |
3797 | +++ data/icons/24x24/categories/Makefile.in 2014-01-19 08:25:25 +0000 |
3798 | @@ -1,7 +1,7 @@ |
3799 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3800 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3801 | # @configure_input@ |
3802 | |
3803 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3804 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3805 | |
3806 | # This Makefile.in is free software; the Free Software Foundation |
3807 | # gives unlimited permission to copy and/or distribute it, |
3808 | @@ -15,23 +15,51 @@ |
3809 | @SET_MAKE@ |
3810 | |
3811 | VPATH = @srcdir@ |
3812 | -am__make_dryrun = \ |
3813 | - { \ |
3814 | - am__dry=no; \ |
3815 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3816 | +am__make_running_with_option = \ |
3817 | + case $${target_option-} in \ |
3818 | + ?) ;; \ |
3819 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3820 | + "target option '$${target_option-}' specified" >&2; \ |
3821 | + exit 1;; \ |
3822 | + esac; \ |
3823 | + has_opt=no; \ |
3824 | + sane_makeflags=$$MAKEFLAGS; \ |
3825 | + if $(am__is_gnu_make); then \ |
3826 | + sane_makeflags=$$MFLAGS; \ |
3827 | + else \ |
3828 | case $$MAKEFLAGS in \ |
3829 | *\\[\ \ ]*) \ |
3830 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3831 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3832 | - *) \ |
3833 | - for am__flg in $$MAKEFLAGS; do \ |
3834 | - case $$am__flg in \ |
3835 | - *=*|--*) ;; \ |
3836 | - *n*) am__dry=yes; break;; \ |
3837 | - esac; \ |
3838 | - done;; \ |
3839 | - esac; \ |
3840 | - test $$am__dry = yes; \ |
3841 | - } |
3842 | + bs=\\; \ |
3843 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3844 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3845 | + esac; \ |
3846 | + fi; \ |
3847 | + skip_next=no; \ |
3848 | + strip_trailopt () \ |
3849 | + { \ |
3850 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3851 | + }; \ |
3852 | + for flg in $$sane_makeflags; do \ |
3853 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3854 | + case $$flg in \ |
3855 | + *=*|--*) continue;; \ |
3856 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3857 | + -*I?*) strip_trailopt 'I';; \ |
3858 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3859 | + -*O?*) strip_trailopt 'O';; \ |
3860 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3861 | + -*l?*) strip_trailopt 'l';; \ |
3862 | + -[dEDm]) skip_next=yes;; \ |
3863 | + -[JT]) skip_next=yes;; \ |
3864 | + esac; \ |
3865 | + case $$flg in \ |
3866 | + *$$target_option*) has_opt=yes; break;; \ |
3867 | + esac; \ |
3868 | + done; \ |
3869 | + test $$has_opt = yes |
3870 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3871 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3872 | pkgdatadir = $(datadir)/@PACKAGE@ |
3873 | pkgincludedir = $(includedir)/@PACKAGE@ |
3874 | pkglibdir = $(libdir)/@PACKAGE@ |
3875 | @@ -157,6 +185,7 @@ |
3876 | GREP = @GREP@ |
3877 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3878 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3879 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3880 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3881 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3882 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3883 | |
3884 | === modified file 'data/icons/24x24/status/Makefile.in' |
3885 | --- data/icons/24x24/status/Makefile.in 2013-06-04 14:16:12 +0000 |
3886 | +++ data/icons/24x24/status/Makefile.in 2014-01-19 08:25:25 +0000 |
3887 | @@ -1,7 +1,7 @@ |
3888 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3889 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3890 | # @configure_input@ |
3891 | |
3892 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3893 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3894 | |
3895 | # This Makefile.in is free software; the Free Software Foundation |
3896 | # gives unlimited permission to copy and/or distribute it, |
3897 | @@ -15,23 +15,51 @@ |
3898 | @SET_MAKE@ |
3899 | |
3900 | VPATH = @srcdir@ |
3901 | -am__make_dryrun = \ |
3902 | - { \ |
3903 | - am__dry=no; \ |
3904 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3905 | +am__make_running_with_option = \ |
3906 | + case $${target_option-} in \ |
3907 | + ?) ;; \ |
3908 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3909 | + "target option '$${target_option-}' specified" >&2; \ |
3910 | + exit 1;; \ |
3911 | + esac; \ |
3912 | + has_opt=no; \ |
3913 | + sane_makeflags=$$MAKEFLAGS; \ |
3914 | + if $(am__is_gnu_make); then \ |
3915 | + sane_makeflags=$$MFLAGS; \ |
3916 | + else \ |
3917 | case $$MAKEFLAGS in \ |
3918 | *\\[\ \ ]*) \ |
3919 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3920 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3921 | - *) \ |
3922 | - for am__flg in $$MAKEFLAGS; do \ |
3923 | - case $$am__flg in \ |
3924 | - *=*|--*) ;; \ |
3925 | - *n*) am__dry=yes; break;; \ |
3926 | - esac; \ |
3927 | - done;; \ |
3928 | - esac; \ |
3929 | - test $$am__dry = yes; \ |
3930 | - } |
3931 | + bs=\\; \ |
3932 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3933 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3934 | + esac; \ |
3935 | + fi; \ |
3936 | + skip_next=no; \ |
3937 | + strip_trailopt () \ |
3938 | + { \ |
3939 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3940 | + }; \ |
3941 | + for flg in $$sane_makeflags; do \ |
3942 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3943 | + case $$flg in \ |
3944 | + *=*|--*) continue;; \ |
3945 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3946 | + -*I?*) strip_trailopt 'I';; \ |
3947 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3948 | + -*O?*) strip_trailopt 'O';; \ |
3949 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3950 | + -*l?*) strip_trailopt 'l';; \ |
3951 | + -[dEDm]) skip_next=yes;; \ |
3952 | + -[JT]) skip_next=yes;; \ |
3953 | + esac; \ |
3954 | + case $$flg in \ |
3955 | + *$$target_option*) has_opt=yes; break;; \ |
3956 | + esac; \ |
3957 | + done; \ |
3958 | + test $$has_opt = yes |
3959 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3960 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3961 | pkgdatadir = $(datadir)/@PACKAGE@ |
3962 | pkgincludedir = $(includedir)/@PACKAGE@ |
3963 | pkglibdir = $(libdir)/@PACKAGE@ |
3964 | @@ -157,6 +185,7 @@ |
3965 | GREP = @GREP@ |
3966 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3967 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
3968 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
3969 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
3970 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
3971 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
3972 | |
3973 | === modified file 'data/icons/48x48/Makefile.in' |
3974 | --- data/icons/48x48/Makefile.in 2013-06-04 14:16:12 +0000 |
3975 | +++ data/icons/48x48/Makefile.in 2014-01-19 08:25:25 +0000 |
3976 | @@ -1,7 +1,7 @@ |
3977 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3978 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
3979 | # @configure_input@ |
3980 | |
3981 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3982 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3983 | |
3984 | # This Makefile.in is free software; the Free Software Foundation |
3985 | # gives unlimited permission to copy and/or distribute it, |
3986 | @@ -14,23 +14,51 @@ |
3987 | |
3988 | @SET_MAKE@ |
3989 | VPATH = @srcdir@ |
3990 | -am__make_dryrun = \ |
3991 | - { \ |
3992 | - am__dry=no; \ |
3993 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3994 | +am__make_running_with_option = \ |
3995 | + case $${target_option-} in \ |
3996 | + ?) ;; \ |
3997 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3998 | + "target option '$${target_option-}' specified" >&2; \ |
3999 | + exit 1;; \ |
4000 | + esac; \ |
4001 | + has_opt=no; \ |
4002 | + sane_makeflags=$$MAKEFLAGS; \ |
4003 | + if $(am__is_gnu_make); then \ |
4004 | + sane_makeflags=$$MFLAGS; \ |
4005 | + else \ |
4006 | case $$MAKEFLAGS in \ |
4007 | *\\[\ \ ]*) \ |
4008 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4009 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4010 | - *) \ |
4011 | - for am__flg in $$MAKEFLAGS; do \ |
4012 | - case $$am__flg in \ |
4013 | - *=*|--*) ;; \ |
4014 | - *n*) am__dry=yes; break;; \ |
4015 | - esac; \ |
4016 | - done;; \ |
4017 | - esac; \ |
4018 | - test $$am__dry = yes; \ |
4019 | - } |
4020 | + bs=\\; \ |
4021 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4022 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4023 | + esac; \ |
4024 | + fi; \ |
4025 | + skip_next=no; \ |
4026 | + strip_trailopt () \ |
4027 | + { \ |
4028 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4029 | + }; \ |
4030 | + for flg in $$sane_makeflags; do \ |
4031 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4032 | + case $$flg in \ |
4033 | + *=*|--*) continue;; \ |
4034 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4035 | + -*I?*) strip_trailopt 'I';; \ |
4036 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4037 | + -*O?*) strip_trailopt 'O';; \ |
4038 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4039 | + -*l?*) strip_trailopt 'l';; \ |
4040 | + -[dEDm]) skip_next=yes;; \ |
4041 | + -[JT]) skip_next=yes;; \ |
4042 | + esac; \ |
4043 | + case $$flg in \ |
4044 | + *$$target_option*) has_opt=yes; break;; \ |
4045 | + esac; \ |
4046 | + done; \ |
4047 | + test $$has_opt = yes |
4048 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4049 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4050 | pkgdatadir = $(datadir)/@PACKAGE@ |
4051 | pkgincludedir = $(includedir)/@PACKAGE@ |
4052 | pkglibdir = $(libdir)/@PACKAGE@ |
4053 | @@ -187,6 +215,7 @@ |
4054 | GREP = @GREP@ |
4055 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4056 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4057 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4058 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4059 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4060 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4061 | @@ -385,13 +414,12 @@ |
4062 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
4063 | # (2) otherwise, pass the desired values on the 'make' command line. |
4064 | $(am__recursive_targets): |
4065 | - @fail= failcom='exit 1'; \ |
4066 | - for f in x $$MAKEFLAGS; do \ |
4067 | - case $$f in \ |
4068 | - *=* | --[!k]*);; \ |
4069 | - *k*) failcom='fail=yes';; \ |
4070 | - esac; \ |
4071 | - done; \ |
4072 | + @fail=; \ |
4073 | + if $(am__make_keepgoing); then \ |
4074 | + failcom='fail=yes'; \ |
4075 | + else \ |
4076 | + failcom='exit 1'; \ |
4077 | + fi; \ |
4078 | dot_seen=no; \ |
4079 | target=`echo $@ | sed s/-recursive//`; \ |
4080 | case "$@" in \ |
4081 | |
4082 | === modified file 'data/icons/48x48/animations/Makefile.in' |
4083 | --- data/icons/48x48/animations/Makefile.in 2013-06-04 14:16:12 +0000 |
4084 | +++ data/icons/48x48/animations/Makefile.in 2014-01-19 08:25:25 +0000 |
4085 | @@ -1,7 +1,7 @@ |
4086 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4087 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4088 | # @configure_input@ |
4089 | |
4090 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4091 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4092 | |
4093 | # This Makefile.in is free software; the Free Software Foundation |
4094 | # gives unlimited permission to copy and/or distribute it, |
4095 | @@ -15,23 +15,51 @@ |
4096 | @SET_MAKE@ |
4097 | |
4098 | VPATH = @srcdir@ |
4099 | -am__make_dryrun = \ |
4100 | - { \ |
4101 | - am__dry=no; \ |
4102 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4103 | +am__make_running_with_option = \ |
4104 | + case $${target_option-} in \ |
4105 | + ?) ;; \ |
4106 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4107 | + "target option '$${target_option-}' specified" >&2; \ |
4108 | + exit 1;; \ |
4109 | + esac; \ |
4110 | + has_opt=no; \ |
4111 | + sane_makeflags=$$MAKEFLAGS; \ |
4112 | + if $(am__is_gnu_make); then \ |
4113 | + sane_makeflags=$$MFLAGS; \ |
4114 | + else \ |
4115 | case $$MAKEFLAGS in \ |
4116 | *\\[\ \ ]*) \ |
4117 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4118 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4119 | - *) \ |
4120 | - for am__flg in $$MAKEFLAGS; do \ |
4121 | - case $$am__flg in \ |
4122 | - *=*|--*) ;; \ |
4123 | - *n*) am__dry=yes; break;; \ |
4124 | - esac; \ |
4125 | - done;; \ |
4126 | - esac; \ |
4127 | - test $$am__dry = yes; \ |
4128 | - } |
4129 | + bs=\\; \ |
4130 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4131 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4132 | + esac; \ |
4133 | + fi; \ |
4134 | + skip_next=no; \ |
4135 | + strip_trailopt () \ |
4136 | + { \ |
4137 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4138 | + }; \ |
4139 | + for flg in $$sane_makeflags; do \ |
4140 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4141 | + case $$flg in \ |
4142 | + *=*|--*) continue;; \ |
4143 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4144 | + -*I?*) strip_trailopt 'I';; \ |
4145 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4146 | + -*O?*) strip_trailopt 'O';; \ |
4147 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4148 | + -*l?*) strip_trailopt 'l';; \ |
4149 | + -[dEDm]) skip_next=yes;; \ |
4150 | + -[JT]) skip_next=yes;; \ |
4151 | + esac; \ |
4152 | + case $$flg in \ |
4153 | + *$$target_option*) has_opt=yes; break;; \ |
4154 | + esac; \ |
4155 | + done; \ |
4156 | + test $$has_opt = yes |
4157 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4158 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4159 | pkgdatadir = $(datadir)/@PACKAGE@ |
4160 | pkgincludedir = $(includedir)/@PACKAGE@ |
4161 | pkglibdir = $(libdir)/@PACKAGE@ |
4162 | @@ -157,6 +185,7 @@ |
4163 | GREP = @GREP@ |
4164 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4165 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4166 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4167 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4168 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4169 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4170 | |
4171 | === modified file 'data/icons/48x48/categories/Makefile.in' |
4172 | --- data/icons/48x48/categories/Makefile.in 2013-06-04 14:16:12 +0000 |
4173 | +++ data/icons/48x48/categories/Makefile.in 2014-01-19 08:25:25 +0000 |
4174 | @@ -1,7 +1,7 @@ |
4175 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4176 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4177 | # @configure_input@ |
4178 | |
4179 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4180 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4181 | |
4182 | # This Makefile.in is free software; the Free Software Foundation |
4183 | # gives unlimited permission to copy and/or distribute it, |
4184 | @@ -15,23 +15,51 @@ |
4185 | @SET_MAKE@ |
4186 | |
4187 | VPATH = @srcdir@ |
4188 | -am__make_dryrun = \ |
4189 | - { \ |
4190 | - am__dry=no; \ |
4191 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4192 | +am__make_running_with_option = \ |
4193 | + case $${target_option-} in \ |
4194 | + ?) ;; \ |
4195 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4196 | + "target option '$${target_option-}' specified" >&2; \ |
4197 | + exit 1;; \ |
4198 | + esac; \ |
4199 | + has_opt=no; \ |
4200 | + sane_makeflags=$$MAKEFLAGS; \ |
4201 | + if $(am__is_gnu_make); then \ |
4202 | + sane_makeflags=$$MFLAGS; \ |
4203 | + else \ |
4204 | case $$MAKEFLAGS in \ |
4205 | *\\[\ \ ]*) \ |
4206 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4207 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4208 | - *) \ |
4209 | - for am__flg in $$MAKEFLAGS; do \ |
4210 | - case $$am__flg in \ |
4211 | - *=*|--*) ;; \ |
4212 | - *n*) am__dry=yes; break;; \ |
4213 | - esac; \ |
4214 | - done;; \ |
4215 | - esac; \ |
4216 | - test $$am__dry = yes; \ |
4217 | - } |
4218 | + bs=\\; \ |
4219 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4220 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4221 | + esac; \ |
4222 | + fi; \ |
4223 | + skip_next=no; \ |
4224 | + strip_trailopt () \ |
4225 | + { \ |
4226 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4227 | + }; \ |
4228 | + for flg in $$sane_makeflags; do \ |
4229 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4230 | + case $$flg in \ |
4231 | + *=*|--*) continue;; \ |
4232 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4233 | + -*I?*) strip_trailopt 'I';; \ |
4234 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4235 | + -*O?*) strip_trailopt 'O';; \ |
4236 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4237 | + -*l?*) strip_trailopt 'l';; \ |
4238 | + -[dEDm]) skip_next=yes;; \ |
4239 | + -[JT]) skip_next=yes;; \ |
4240 | + esac; \ |
4241 | + case $$flg in \ |
4242 | + *$$target_option*) has_opt=yes; break;; \ |
4243 | + esac; \ |
4244 | + done; \ |
4245 | + test $$has_opt = yes |
4246 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4247 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4248 | pkgdatadir = $(datadir)/@PACKAGE@ |
4249 | pkgincludedir = $(includedir)/@PACKAGE@ |
4250 | pkglibdir = $(libdir)/@PACKAGE@ |
4251 | @@ -157,6 +185,7 @@ |
4252 | GREP = @GREP@ |
4253 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4254 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4255 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4256 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4257 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4258 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4259 | |
4260 | === modified file 'data/icons/48x48/status/Makefile.in' |
4261 | --- data/icons/48x48/status/Makefile.in 2013-06-04 14:16:12 +0000 |
4262 | +++ data/icons/48x48/status/Makefile.in 2014-01-19 08:25:25 +0000 |
4263 | @@ -1,7 +1,7 @@ |
4264 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4265 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4266 | # @configure_input@ |
4267 | |
4268 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4269 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4270 | |
4271 | # This Makefile.in is free software; the Free Software Foundation |
4272 | # gives unlimited permission to copy and/or distribute it, |
4273 | @@ -15,23 +15,51 @@ |
4274 | @SET_MAKE@ |
4275 | |
4276 | VPATH = @srcdir@ |
4277 | -am__make_dryrun = \ |
4278 | - { \ |
4279 | - am__dry=no; \ |
4280 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4281 | +am__make_running_with_option = \ |
4282 | + case $${target_option-} in \ |
4283 | + ?) ;; \ |
4284 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4285 | + "target option '$${target_option-}' specified" >&2; \ |
4286 | + exit 1;; \ |
4287 | + esac; \ |
4288 | + has_opt=no; \ |
4289 | + sane_makeflags=$$MAKEFLAGS; \ |
4290 | + if $(am__is_gnu_make); then \ |
4291 | + sane_makeflags=$$MFLAGS; \ |
4292 | + else \ |
4293 | case $$MAKEFLAGS in \ |
4294 | *\\[\ \ ]*) \ |
4295 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4296 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4297 | - *) \ |
4298 | - for am__flg in $$MAKEFLAGS; do \ |
4299 | - case $$am__flg in \ |
4300 | - *=*|--*) ;; \ |
4301 | - *n*) am__dry=yes; break;; \ |
4302 | - esac; \ |
4303 | - done;; \ |
4304 | - esac; \ |
4305 | - test $$am__dry = yes; \ |
4306 | - } |
4307 | + bs=\\; \ |
4308 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4309 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4310 | + esac; \ |
4311 | + fi; \ |
4312 | + skip_next=no; \ |
4313 | + strip_trailopt () \ |
4314 | + { \ |
4315 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4316 | + }; \ |
4317 | + for flg in $$sane_makeflags; do \ |
4318 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4319 | + case $$flg in \ |
4320 | + *=*|--*) continue;; \ |
4321 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4322 | + -*I?*) strip_trailopt 'I';; \ |
4323 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4324 | + -*O?*) strip_trailopt 'O';; \ |
4325 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4326 | + -*l?*) strip_trailopt 'l';; \ |
4327 | + -[dEDm]) skip_next=yes;; \ |
4328 | + -[JT]) skip_next=yes;; \ |
4329 | + esac; \ |
4330 | + case $$flg in \ |
4331 | + *$$target_option*) has_opt=yes; break;; \ |
4332 | + esac; \ |
4333 | + done; \ |
4334 | + test $$has_opt = yes |
4335 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4336 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4337 | pkgdatadir = $(datadir)/@PACKAGE@ |
4338 | pkgincludedir = $(includedir)/@PACKAGE@ |
4339 | pkglibdir = $(libdir)/@PACKAGE@ |
4340 | @@ -157,6 +185,7 @@ |
4341 | GREP = @GREP@ |
4342 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4343 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4344 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4345 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4346 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4347 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4348 | |
4349 | === modified file 'data/icons/Makefile.am' |
4350 | --- data/icons/Makefile.am 2011-02-23 18:23:07 +0000 |
4351 | +++ data/icons/Makefile.am 2014-01-19 08:25:25 +0000 |
4352 | @@ -1,13 +1,15 @@ |
4353 | SUBDIRS = scalable 16x16 22x22 24x24 48x48 |
4354 | |
4355 | -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor |
4356 | +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor |
4357 | |
4358 | -install-data-hook: |
4359 | +install-data-hook: update-icon-cache |
4360 | +uninstall-hook: update-icon-cache |
4361 | +update-icon-cache: |
4362 | @-if test -z "$(DESTDIR)"; then \ |
4363 | echo "Updating Gtk icon cache."; \ |
4364 | $(gtk_update_icon_cache); \ |
4365 | else \ |
4366 | - echo "*** Icon cache not updated. After install, run this:"; \ |
4367 | + echo "*** Icon cache not updated. After (un)install, run this:"; \ |
4368 | echo "*** $(gtk_update_icon_cache)"; \ |
4369 | fi |
4370 | |
4371 | |
4372 | === modified file 'data/icons/Makefile.in' |
4373 | --- data/icons/Makefile.in 2013-06-04 14:16:12 +0000 |
4374 | +++ data/icons/Makefile.in 2014-01-19 08:25:25 +0000 |
4375 | @@ -1,7 +1,7 @@ |
4376 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4377 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4378 | # @configure_input@ |
4379 | |
4380 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4381 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4382 | |
4383 | # This Makefile.in is free software; the Free Software Foundation |
4384 | # gives unlimited permission to copy and/or distribute it, |
4385 | @@ -14,23 +14,51 @@ |
4386 | |
4387 | @SET_MAKE@ |
4388 | VPATH = @srcdir@ |
4389 | -am__make_dryrun = \ |
4390 | - { \ |
4391 | - am__dry=no; \ |
4392 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4393 | +am__make_running_with_option = \ |
4394 | + case $${target_option-} in \ |
4395 | + ?) ;; \ |
4396 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4397 | + "target option '$${target_option-}' specified" >&2; \ |
4398 | + exit 1;; \ |
4399 | + esac; \ |
4400 | + has_opt=no; \ |
4401 | + sane_makeflags=$$MAKEFLAGS; \ |
4402 | + if $(am__is_gnu_make); then \ |
4403 | + sane_makeflags=$$MFLAGS; \ |
4404 | + else \ |
4405 | case $$MAKEFLAGS in \ |
4406 | *\\[\ \ ]*) \ |
4407 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4408 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4409 | - *) \ |
4410 | - for am__flg in $$MAKEFLAGS; do \ |
4411 | - case $$am__flg in \ |
4412 | - *=*|--*) ;; \ |
4413 | - *n*) am__dry=yes; break;; \ |
4414 | - esac; \ |
4415 | - done;; \ |
4416 | - esac; \ |
4417 | - test $$am__dry = yes; \ |
4418 | - } |
4419 | + bs=\\; \ |
4420 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4421 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4422 | + esac; \ |
4423 | + fi; \ |
4424 | + skip_next=no; \ |
4425 | + strip_trailopt () \ |
4426 | + { \ |
4427 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4428 | + }; \ |
4429 | + for flg in $$sane_makeflags; do \ |
4430 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4431 | + case $$flg in \ |
4432 | + *=*|--*) continue;; \ |
4433 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4434 | + -*I?*) strip_trailopt 'I';; \ |
4435 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4436 | + -*O?*) strip_trailopt 'O';; \ |
4437 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4438 | + -*l?*) strip_trailopt 'l';; \ |
4439 | + -[dEDm]) skip_next=yes;; \ |
4440 | + -[JT]) skip_next=yes;; \ |
4441 | + esac; \ |
4442 | + case $$flg in \ |
4443 | + *$$target_option*) has_opt=yes; break;; \ |
4444 | + esac; \ |
4445 | + done; \ |
4446 | + test $$has_opt = yes |
4447 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4448 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4449 | pkgdatadir = $(datadir)/@PACKAGE@ |
4450 | pkgincludedir = $(includedir)/@PACKAGE@ |
4451 | pkglibdir = $(libdir)/@PACKAGE@ |
4452 | @@ -187,6 +215,7 @@ |
4453 | GREP = @GREP@ |
4454 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4455 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4456 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4457 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4458 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4459 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4460 | @@ -338,7 +367,7 @@ |
4461 | top_builddir = @top_builddir@ |
4462 | top_srcdir = @top_srcdir@ |
4463 | SUBDIRS = scalable 16x16 22x22 24x24 48x48 |
4464 | -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor |
4465 | +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor |
4466 | all: all-recursive |
4467 | |
4468 | .SUFFIXES: |
4469 | @@ -386,13 +415,12 @@ |
4470 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
4471 | # (2) otherwise, pass the desired values on the 'make' command line. |
4472 | $(am__recursive_targets): |
4473 | - @fail= failcom='exit 1'; \ |
4474 | - for f in x $$MAKEFLAGS; do \ |
4475 | - case $$f in \ |
4476 | - *=* | --[!k]*);; \ |
4477 | - *k*) failcom='fail=yes';; \ |
4478 | - esac; \ |
4479 | - done; \ |
4480 | + @fail=; \ |
4481 | + if $(am__make_keepgoing); then \ |
4482 | + failcom='fail=yes'; \ |
4483 | + else \ |
4484 | + failcom='exit 1'; \ |
4485 | + fi; \ |
4486 | dot_seen=no; \ |
4487 | target=`echo $@ | sed s/-recursive//`; \ |
4488 | case "$@" in \ |
4489 | @@ -635,9 +663,10 @@ |
4490 | ps-am: |
4491 | |
4492 | uninstall-am: |
4493 | - |
4494 | + @$(NORMAL_INSTALL) |
4495 | + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook |
4496 | .MAKE: $(am__recursive_targets) install-am install-data-am \ |
4497 | - install-strip |
4498 | + install-strip uninstall-am |
4499 | |
4500 | .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ |
4501 | check-am clean clean-generic clean-libtool cscopelist-am ctags \ |
4502 | @@ -651,15 +680,17 @@ |
4503 | installcheck-am installdirs installdirs-am maintainer-clean \ |
4504 | maintainer-clean-generic mostlyclean mostlyclean-generic \ |
4505 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
4506 | - uninstall-am |
4507 | - |
4508 | - |
4509 | -install-data-hook: |
4510 | + uninstall-am uninstall-hook |
4511 | + |
4512 | + |
4513 | +install-data-hook: update-icon-cache |
4514 | +uninstall-hook: update-icon-cache |
4515 | +update-icon-cache: |
4516 | @-if test -z "$(DESTDIR)"; then \ |
4517 | echo "Updating Gtk icon cache."; \ |
4518 | $(gtk_update_icon_cache); \ |
4519 | else \ |
4520 | - echo "*** Icon cache not updated. After install, run this:"; \ |
4521 | + echo "*** Icon cache not updated. After (un)install, run this:"; \ |
4522 | echo "*** $(gtk_update_icon_cache)"; \ |
4523 | fi |
4524 | |
4525 | |
4526 | === modified file 'data/icons/scalable/Makefile.in' |
4527 | --- data/icons/scalable/Makefile.in 2013-06-04 14:16:12 +0000 |
4528 | +++ data/icons/scalable/Makefile.in 2014-01-19 08:25:25 +0000 |
4529 | @@ -1,7 +1,7 @@ |
4530 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4531 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4532 | # @configure_input@ |
4533 | |
4534 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4535 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4536 | |
4537 | # This Makefile.in is free software; the Free Software Foundation |
4538 | # gives unlimited permission to copy and/or distribute it, |
4539 | @@ -14,23 +14,51 @@ |
4540 | |
4541 | @SET_MAKE@ |
4542 | VPATH = @srcdir@ |
4543 | -am__make_dryrun = \ |
4544 | - { \ |
4545 | - am__dry=no; \ |
4546 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4547 | +am__make_running_with_option = \ |
4548 | + case $${target_option-} in \ |
4549 | + ?) ;; \ |
4550 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4551 | + "target option '$${target_option-}' specified" >&2; \ |
4552 | + exit 1;; \ |
4553 | + esac; \ |
4554 | + has_opt=no; \ |
4555 | + sane_makeflags=$$MAKEFLAGS; \ |
4556 | + if $(am__is_gnu_make); then \ |
4557 | + sane_makeflags=$$MFLAGS; \ |
4558 | + else \ |
4559 | case $$MAKEFLAGS in \ |
4560 | *\\[\ \ ]*) \ |
4561 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4562 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4563 | - *) \ |
4564 | - for am__flg in $$MAKEFLAGS; do \ |
4565 | - case $$am__flg in \ |
4566 | - *=*|--*) ;; \ |
4567 | - *n*) am__dry=yes; break;; \ |
4568 | - esac; \ |
4569 | - done;; \ |
4570 | - esac; \ |
4571 | - test $$am__dry = yes; \ |
4572 | - } |
4573 | + bs=\\; \ |
4574 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4575 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4576 | + esac; \ |
4577 | + fi; \ |
4578 | + skip_next=no; \ |
4579 | + strip_trailopt () \ |
4580 | + { \ |
4581 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4582 | + }; \ |
4583 | + for flg in $$sane_makeflags; do \ |
4584 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4585 | + case $$flg in \ |
4586 | + *=*|--*) continue;; \ |
4587 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4588 | + -*I?*) strip_trailopt 'I';; \ |
4589 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4590 | + -*O?*) strip_trailopt 'O';; \ |
4591 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4592 | + -*l?*) strip_trailopt 'l';; \ |
4593 | + -[dEDm]) skip_next=yes;; \ |
4594 | + -[JT]) skip_next=yes;; \ |
4595 | + esac; \ |
4596 | + case $$flg in \ |
4597 | + *$$target_option*) has_opt=yes; break;; \ |
4598 | + esac; \ |
4599 | + done; \ |
4600 | + test $$has_opt = yes |
4601 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4602 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4603 | pkgdatadir = $(datadir)/@PACKAGE@ |
4604 | pkgincludedir = $(includedir)/@PACKAGE@ |
4605 | pkglibdir = $(libdir)/@PACKAGE@ |
4606 | @@ -187,6 +215,7 @@ |
4607 | GREP = @GREP@ |
4608 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4609 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4610 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4611 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4612 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4613 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4614 | @@ -385,13 +414,12 @@ |
4615 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
4616 | # (2) otherwise, pass the desired values on the 'make' command line. |
4617 | $(am__recursive_targets): |
4618 | - @fail= failcom='exit 1'; \ |
4619 | - for f in x $$MAKEFLAGS; do \ |
4620 | - case $$f in \ |
4621 | - *=* | --[!k]*);; \ |
4622 | - *k*) failcom='fail=yes';; \ |
4623 | - esac; \ |
4624 | - done; \ |
4625 | + @fail=; \ |
4626 | + if $(am__make_keepgoing); then \ |
4627 | + failcom='fail=yes'; \ |
4628 | + else \ |
4629 | + failcom='exit 1'; \ |
4630 | + fi; \ |
4631 | dot_seen=no; \ |
4632 | target=`echo $@ | sed s/-recursive//`; \ |
4633 | case "$@" in \ |
4634 | |
4635 | === modified file 'data/icons/scalable/categories/Makefile.in' |
4636 | --- data/icons/scalable/categories/Makefile.in 2013-06-04 14:16:12 +0000 |
4637 | +++ data/icons/scalable/categories/Makefile.in 2014-01-19 08:25:25 +0000 |
4638 | @@ -1,7 +1,7 @@ |
4639 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4640 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4641 | # @configure_input@ |
4642 | |
4643 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4644 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4645 | |
4646 | # This Makefile.in is free software; the Free Software Foundation |
4647 | # gives unlimited permission to copy and/or distribute it, |
4648 | @@ -15,23 +15,51 @@ |
4649 | @SET_MAKE@ |
4650 | |
4651 | VPATH = @srcdir@ |
4652 | -am__make_dryrun = \ |
4653 | - { \ |
4654 | - am__dry=no; \ |
4655 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4656 | +am__make_running_with_option = \ |
4657 | + case $${target_option-} in \ |
4658 | + ?) ;; \ |
4659 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4660 | + "target option '$${target_option-}' specified" >&2; \ |
4661 | + exit 1;; \ |
4662 | + esac; \ |
4663 | + has_opt=no; \ |
4664 | + sane_makeflags=$$MAKEFLAGS; \ |
4665 | + if $(am__is_gnu_make); then \ |
4666 | + sane_makeflags=$$MFLAGS; \ |
4667 | + else \ |
4668 | case $$MAKEFLAGS in \ |
4669 | *\\[\ \ ]*) \ |
4670 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4671 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4672 | - *) \ |
4673 | - for am__flg in $$MAKEFLAGS; do \ |
4674 | - case $$am__flg in \ |
4675 | - *=*|--*) ;; \ |
4676 | - *n*) am__dry=yes; break;; \ |
4677 | - esac; \ |
4678 | - done;; \ |
4679 | - esac; \ |
4680 | - test $$am__dry = yes; \ |
4681 | - } |
4682 | + bs=\\; \ |
4683 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4684 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4685 | + esac; \ |
4686 | + fi; \ |
4687 | + skip_next=no; \ |
4688 | + strip_trailopt () \ |
4689 | + { \ |
4690 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4691 | + }; \ |
4692 | + for flg in $$sane_makeflags; do \ |
4693 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4694 | + case $$flg in \ |
4695 | + *=*|--*) continue;; \ |
4696 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4697 | + -*I?*) strip_trailopt 'I';; \ |
4698 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4699 | + -*O?*) strip_trailopt 'O';; \ |
4700 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4701 | + -*l?*) strip_trailopt 'l';; \ |
4702 | + -[dEDm]) skip_next=yes;; \ |
4703 | + -[JT]) skip_next=yes;; \ |
4704 | + esac; \ |
4705 | + case $$flg in \ |
4706 | + *$$target_option*) has_opt=yes; break;; \ |
4707 | + esac; \ |
4708 | + done; \ |
4709 | + test $$has_opt = yes |
4710 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4711 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4712 | pkgdatadir = $(datadir)/@PACKAGE@ |
4713 | pkgincludedir = $(includedir)/@PACKAGE@ |
4714 | pkglibdir = $(libdir)/@PACKAGE@ |
4715 | @@ -157,6 +185,7 @@ |
4716 | GREP = @GREP@ |
4717 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4718 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4719 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4720 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4721 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4722 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4723 | |
4724 | === modified file 'data/icons/scalable/status/Makefile.in' |
4725 | --- data/icons/scalable/status/Makefile.in 2013-06-04 14:16:12 +0000 |
4726 | +++ data/icons/scalable/status/Makefile.in 2014-01-19 08:25:25 +0000 |
4727 | @@ -1,7 +1,7 @@ |
4728 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4729 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4730 | # @configure_input@ |
4731 | |
4732 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4733 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4734 | |
4735 | # This Makefile.in is free software; the Free Software Foundation |
4736 | # gives unlimited permission to copy and/or distribute it, |
4737 | @@ -15,23 +15,51 @@ |
4738 | @SET_MAKE@ |
4739 | |
4740 | VPATH = @srcdir@ |
4741 | -am__make_dryrun = \ |
4742 | - { \ |
4743 | - am__dry=no; \ |
4744 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4745 | +am__make_running_with_option = \ |
4746 | + case $${target_option-} in \ |
4747 | + ?) ;; \ |
4748 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4749 | + "target option '$${target_option-}' specified" >&2; \ |
4750 | + exit 1;; \ |
4751 | + esac; \ |
4752 | + has_opt=no; \ |
4753 | + sane_makeflags=$$MAKEFLAGS; \ |
4754 | + if $(am__is_gnu_make); then \ |
4755 | + sane_makeflags=$$MFLAGS; \ |
4756 | + else \ |
4757 | case $$MAKEFLAGS in \ |
4758 | *\\[\ \ ]*) \ |
4759 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4760 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4761 | - *) \ |
4762 | - for am__flg in $$MAKEFLAGS; do \ |
4763 | - case $$am__flg in \ |
4764 | - *=*|--*) ;; \ |
4765 | - *n*) am__dry=yes; break;; \ |
4766 | - esac; \ |
4767 | - done;; \ |
4768 | - esac; \ |
4769 | - test $$am__dry = yes; \ |
4770 | - } |
4771 | + bs=\\; \ |
4772 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4773 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4774 | + esac; \ |
4775 | + fi; \ |
4776 | + skip_next=no; \ |
4777 | + strip_trailopt () \ |
4778 | + { \ |
4779 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4780 | + }; \ |
4781 | + for flg in $$sane_makeflags; do \ |
4782 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4783 | + case $$flg in \ |
4784 | + *=*|--*) continue;; \ |
4785 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4786 | + -*I?*) strip_trailopt 'I';; \ |
4787 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4788 | + -*O?*) strip_trailopt 'O';; \ |
4789 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4790 | + -*l?*) strip_trailopt 'l';; \ |
4791 | + -[dEDm]) skip_next=yes;; \ |
4792 | + -[JT]) skip_next=yes;; \ |
4793 | + esac; \ |
4794 | + case $$flg in \ |
4795 | + *$$target_option*) has_opt=yes; break;; \ |
4796 | + esac; \ |
4797 | + done; \ |
4798 | + test $$has_opt = yes |
4799 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4800 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4801 | pkgdatadir = $(datadir)/@PACKAGE@ |
4802 | pkgincludedir = $(includedir)/@PACKAGE@ |
4803 | pkglibdir = $(libdir)/@PACKAGE@ |
4804 | @@ -157,6 +185,7 @@ |
4805 | GREP = @GREP@ |
4806 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
4807 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
4808 | +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ |
4809 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4810 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4811 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4812 | |
4813 | === modified file 'debian/changelog' |
4814 | --- debian/changelog 2013-08-28 06:56:44 +0000 |
4815 | +++ debian/changelog 2014-01-19 08:25:25 +0000 |
4816 | @@ -1,3 +1,25 @@ |
4817 | +gnome-packagekit (3.10.1-1ubuntu1) trusty; urgency=medium |
4818 | + |
4819 | + * Merge from debian. Remaining changes: |
4820 | + - Drop build dependency on obsoleted gtk-doc-utils and libapt-pkg-dev |
4821 | + - Raise version of the libglib2.0-dev build dependency |
4822 | + - Alternatively depend on aptdaemon's PackageKit compatibility layer |
4823 | + * Revert update-notifier transition change from debian |
4824 | + |
4825 | + -- Jackson Doak <noskcaj@ubuntu.com> Sat, 21 Dec 2013 09:51:49 +1100 |
4826 | + |
4827 | +gnome-packagekit (3.10.1-1) unstable; urgency=low |
4828 | + |
4829 | + * New upstream release: 3.10.1 |
4830 | + - Closes: #717898 |
4831 | + - Closes: #657801 (partially) |
4832 | + * Remove the old and outdated python-packagekit-gtk package |
4833 | + * Build-depend on yelp-tools instead of gnome-doc-utils |
4834 | + * Provide transition from update-notifier |
4835 | + to GNOME-PackageKit (Closes: #707706) |
4836 | + |
4837 | + -- Matthias Klumpp <mak@debian.org> Wed, 04 Dec 2013 18:46:38 +0100 |
4838 | + |
4839 | gnome-packagekit (3.8.2-4ubuntu1) saucy; urgency=low |
4840 | |
4841 | * Merge with Debian Unstable (LP: #1200303). Remaining change: |
4842 | |
4843 | === modified file 'debian/control' |
4844 | --- debian/control 2013-08-28 06:56:44 +0000 |
4845 | +++ debian/control 2014-01-19 08:25:25 +0000 |
4846 | @@ -2,13 +2,12 @@ |
4847 | Section: gnome |
4848 | Priority: optional |
4849 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
4850 | -XSBC-Original-Maintainer: Matthias Klumpp <matthias@tenstral.net> |
4851 | +XSBC-Original-Maintainer: Matthias Klumpp <mak@debian.org> |
4852 | Vcs-Git: git://anonscm.debian.org/pkg-packagekit/gnome-packagekit.git |
4853 | Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-packagekit/gnome-packagekit.git |
4854 | Build-Depends: debhelper (>= 9.0.0), |
4855 | dh-autoreconf, |
4856 | docbook-utils, |
4857 | - yelp-tools, |
4858 | intltool (>= 0.40), |
4859 | itstool, |
4860 | libcanberra-gtk3-dev, |
4861 | @@ -24,7 +23,8 @@ |
4862 | libx11-dev, |
4863 | python-dev, |
4864 | rarian-compat, |
4865 | - xmlto |
4866 | + xmlto, |
4867 | + yelp-tools |
4868 | Standards-Version: 3.9.4 |
4869 | Homepage: http://help.gnome.org/users/gnome-packagekit/stable/ |
4870 | |
4871 | @@ -93,4 +93,4 @@ |
4872 | This package contains several small GUI helper tools for sofware management, |
4873 | which are able to install mime-types or package catalogs. |
4874 | It also contains an utility to generate service packs for offline package |
4875 | - installation. |
4876 | + installation. |
4877 | \ No newline at end of file |
4878 | |
4879 | === modified file 'debian/gnome-packagekit.install' |
4880 | --- debian/gnome-packagekit.install 2013-06-04 14:16:12 +0000 |
4881 | +++ debian/gnome-packagekit.install 2014-01-19 08:25:25 +0000 |
4882 | @@ -1,6 +1,7 @@ |
4883 | usr/bin/gpk-application |
4884 | usr/bin/gpk-install-local-file |
4885 | usr/bin/gpk-update-viewer |
4886 | +usr/share/appdata/* |
4887 | usr/share/applications/gpk-application.desktop |
4888 | usr/share/applications/gpk-install-local-file.desktop |
4889 | usr/share/applications/gpk-update-viewer.desktop |
4890 | |
4891 | === modified file 'debian/rules' |
4892 | --- debian/rules 2012-09-27 23:50:55 +0000 |
4893 | +++ debian/rules 2014-01-19 08:25:25 +0000 |
4894 | @@ -8,7 +8,7 @@ |
4895 | INSTALLDIR = $(CURDIR)/debian/tmp |
4896 | |
4897 | %: |
4898 | - dh $@ --parallel --with python2 |
4899 | + dh $@ --parallel |
4900 | |
4901 | override_dh_auto_configure: |
4902 | dh_auto_configure -- $(GPK_CONFIGURE_FLAGS) |
4903 | @@ -19,6 +19,7 @@ |
4904 | # We don't ship these files |
4905 | rm -f $(INSTALLDIR)/usr/share/applications/gpk-distro-upgrade.desktop |
4906 | rm -f $(INSTALLDIR)/usr/bin/gpk-distro-upgrade |
4907 | + rm -rf $(INSTALLDIR)/usr/lib/python* |
4908 | |
4909 | override_dh_install: |
4910 | dh_install --list-missing |
4911 | |
4912 | === modified file 'depcomp' |
4913 | --- depcomp 2013-06-04 14:16:12 +0000 |
4914 | +++ depcomp 2014-01-19 08:25:25 +0000 |
4915 | @@ -1,7 +1,7 @@ |
4916 | #! /bin/sh |
4917 | # depcomp - compile a program generating dependencies as side-effects |
4918 | |
4919 | -scriptversion=2012-10-18.11; # UTC |
4920 | +scriptversion=2013-05-30.07; # UTC |
4921 | |
4922 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. |
4923 | |
4924 | @@ -552,6 +552,7 @@ |
4925 | G |
4926 | p |
4927 | }' >> "$depfile" |
4928 | + echo >> "$depfile" # make sure the fragment doesn't end with a backslash |
4929 | rm -f "$tmpdepfile" |
4930 | ;; |
4931 | |
4932 | |
4933 | === modified file 'docs/Makefile.in' |
4934 | --- docs/Makefile.in 2013-06-04 14:16:12 +0000 |
4935 | +++ docs/Makefile.in 2014-01-19 08:25:25 +0000 |
4936 | @@ -1,7 +1,7 @@ |
4937 | -# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4938 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
4939 | # @configure_input@ |
4940 | |
4941 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4942 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4943 | |
4944 | # This Makefile.in is free software; the Free Software Foundation |
4945 | # gives unlimited permission to copy and/or distribute it, |
4946 | @@ -14,23 +14,51 @@ |
4947 | |
4948 | @SET_MAKE@ |
4949 | VPATH = @srcdir@ |
4950 | -am__make_dryrun = \ |
4951 | - { \ |
4952 | - am__dry=no; \ |
4953 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4954 | +am__make_running_with_option = \ |
4955 | + case $${target_option-} in \ |
4956 | + ?) ;; \ |
4957 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4958 | + "target option '$${target_option-}' specified" >&2; \ |
4959 | + exit 1;; \ |
4960 | + esac; \ |
4961 | + has_opt=no; \ |
4962 | + sane_makeflags=$$MAKEFLAGS; \ |
4963 | + if $(am__is_gnu_make); then \ |
4964 | + sane_makeflags=$$MFLAGS; \ |
4965 | + else \ |
4966 | case $$MAKEFLAGS in \ |
4967 | *\\[\ \ ]*) \ |
4968 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4969 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4970 | - *) \ |
4971 | - for am__flg in $$MAKEFLAGS; do \ |
4972 | - case $$am__flg in \ |
4973 | - *=*|--*) ;; \ |
4974 | - *n*) am__dry=yes; break;; \ |
4975 | - esac; \ |
4976 | - done;; \ |
4977 | - esac; \ |
4978 | - test $$am__dry = yes; \ |
4979 | - } |
4980 | + bs=\\; \ |
4981 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4982 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4983 | + esac; \ |
4984 | + fi; \ |
4985 | + skip_next=no; \ |
4986 | + strip_trailopt () \ |
4987 | + { \ |
4988 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4989 | + }; \ |
4990 | + for flg in $$sane_makeflags; do \ |
4991 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4992 | + case $$flg in \ |
4993 | + *=*|--*) continue;; \ |
4994 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4995 | + -*I?*) strip_trailopt 'I';; \ |
4996 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4997 | + -*O?*) strip_trailopt 'O';; \ |
4998 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4999 | + -*l?*) strip_trailopt 'l';; \ |
5000 | + -[dEDm]) skip_next=yes;; \ |
The diff has been truncated for viewing.
- You didn't make this mistake, but it should be fixed. Update the XSBC-Original- Maintainer line to use the right email (<email address hidden>).
- You should drop the update-notifier changes. Debian is dropping it in favor of gnome-packagekit, but Ubuntu isn't.