Merge lp:~online-accounts/libaccounts-glib/packaging into lp:libaccounts-glib
- packaging
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | David Barth |
Approved revision: | no longer in the source branch. |
Merged at revision: | 194 |
Proposed branch: | lp:~online-accounts/libaccounts-glib/packaging |
Merge into: | lp:libaccounts-glib |
Diff against target: |
736 lines (+299/-168) 29 files modified
NEWS (+29/-0) configure.ac (+2/-1) debian/changelog (+13/-0) libaccounts-glib/ag-manager.c (+16/-1) libaccounts-glib/ag-util.c (+15/-1) tests/Gallery.application (+0/-17) tests/Mailer.application (+0/-12) tests/Makefile.am (+3/-14) tests/MyProvider.provider (+0/-19) tests/MyService.service (+0/-22) tests/MyService2.service (+0/-15) tests/OtherService.service (+0/-22) tests/accounts-glib-test.sh (+4/-4) tests/applications/Mailer.desktop (+0/-8) tests/check_ag.c (+51/-0) tests/data/Makefile.am (+11/-0) tests/data/accounts/applications/Gallery.application (+17/-0) tests/data/accounts/applications/Mailer.application (+12/-0) tests/data/accounts/providers/MyProvider.provider (+19/-0) tests/data/accounts/providers/fake-os/MyProvider.provider (+8/-0) tests/data/accounts/providers/maemo.provider (+17/-0) tests/data/accounts/service-types/e-mail.service-type (+11/-0) tests/data/accounts/services/MyService.service (+22/-0) tests/data/accounts/services/MyService2.service (+15/-0) tests/data/accounts/services/OtherService.service (+22/-0) tests/data/applications/Mailer.desktop (+8/-0) tests/e-mail.service-type (+0/-11) tests/maemo.provider (+0/-17) tests/xml-dtd-validate.sh (+4/-4) |
To merge this branch: | bzr merge lp:~online-accounts/libaccounts-glib/packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Online Accounts | Pending | ||
Review via email: mp+286621@code.launchpad.net |
Commit message
New upstream release
- Support desktop-specific overrides for service and providers files:
desktops can define service and providers files in
/usr/
and these would override any files having the same name in the parent
(default) directory (LP: #1451728)
- Fix endianness issues
https:/
Description of the change
New upstream release
- Support desktop-specific overrides for service and providers files:
desktops can define service and providers files in
/usr/
and these would override any files having the same name in the parent
(default) directory (LP: #1451728)
- Fix endianness issues
https:/
- 194. By Alberto Mardegan
-
New upstream release
- Support desktop-specific overrides for service and providers files:
desktops can define service and providers files in
/usr/share/accounts/ {providers, services} /$XDG_CURRENT_ DESKTOP
and these would override any files having the same name in the parent
(default) directory (LP: #1451728)
- Fix endianness issues
https://gitlab. com/accounts- sso/libaccounts -glib/issues/ 2
Fixes: #1451728
Preview Diff
1 | === modified file 'NEWS' |
2 | --- NEWS 2014-09-01 13:14:34 +0000 |
3 | +++ NEWS 2016-02-19 10:06:27 +0000 |
4 | @@ -1,5 +1,34 @@ |
5 | libaccounts-glib NEWS |
6 | |
7 | +Version 1.21 |
8 | +------------ |
9 | + |
10 | +* Fix installation of test data files |
11 | + |
12 | +Version 1.20 |
13 | +------------ |
14 | + |
15 | +* Support desktop-specific overrides for service and providers files: |
16 | + desktops can define service and providers files in |
17 | + /usr/share/accounts/{providers,services}/$XDG_CURRENT_DESKTOP |
18 | + and these would override any files having the same name in the parent |
19 | + (default) directory. |
20 | +* Fix endianness issues |
21 | + https://gitlab.com/accounts-sso/libaccounts-glib/issues/2 |
22 | + |
23 | +Version 1.19 |
24 | +------------ |
25 | + |
26 | +* Build: ignore deprecations of GSimpleAsyncResult |
27 | +* Build: don't emit a build error on deprecations |
28 | +* Coverage: allow lcov versions up to 1.11 |
29 | +* Build: fix handling of coverage flags |
30 | +* Build: fix build errors when building with clang |
31 | +* Update account ID after a remotely-executed store |
32 | +* Vala: add allow-none and update VAPI file |
33 | + https://code.google.com/p/accounts-sso/issues/detail?id=241 |
34 | +* Build: multiarch fixes |
35 | + |
36 | Version 1.18 |
37 | ------------ |
38 | |
39 | |
40 | === modified file 'configure.ac' |
41 | --- configure.ac 2015-12-08 14:43:26 +0000 |
42 | +++ configure.ac 2016-02-19 10:06:27 +0000 |
43 | @@ -1,7 +1,7 @@ |
44 | dnl Process this file with autoconf to produce a configure script. |
45 | AC_PREREQ([2.64]) |
46 | AC_INIT([libaccounts-glib], |
47 | - [1.19], |
48 | + [1.21], |
49 | [https://gitlab.com/accounts-sso/libaccounts-glib/issues], |
50 | [libaccounts-glib], |
51 | [https://gitlab.com/accounts-sso/libaccounts-glib]) |
52 | @@ -190,6 +190,7 @@ |
53 | docs/reference/version.xml |
54 | pygobject/Makefile |
55 | tests/Makefile |
56 | + tests/data/Makefile |
57 | tools/Makefile |
58 | ]) |
59 | AC_OUTPUT |
60 | |
61 | === modified file 'debian/changelog' |
62 | --- debian/changelog 2015-12-21 08:57:49 +0000 |
63 | +++ debian/changelog 2016-02-19 10:06:27 +0000 |
64 | @@ -1,3 +1,16 @@ |
65 | +libaccounts-glib (1.21-0ubuntu1) UNRELEASED; urgency=medium |
66 | + |
67 | + * New upstream release |
68 | + - Support desktop-specific overrides for service and providers files: |
69 | + desktops can define service and providers files in |
70 | + /usr/share/accounts/{providers,services}/$XDG_CURRENT_DESKTOP |
71 | + and these would override any files having the same name in the parent |
72 | + (default) directory (LP: #1451728) |
73 | + - Fix endianness issues |
74 | + https://gitlab.com/accounts-sso/libaccounts-glib/issues/2 |
75 | + |
76 | + -- Alberto Mardegan <alberto.mardegan@canonical.com> Fri, 19 Feb 2016 13:00:19 +0300 |
77 | + |
78 | libaccounts-glib (1.19+16.04.20151221-0ubuntu1) xenial; urgency=medium |
79 | |
80 | [ Alberto Mardegan ] |
81 | |
82 | === modified file 'libaccounts-glib/ag-manager.c' |
83 | --- libaccounts-glib/ag-manager.c 2015-12-18 15:16:14 +0000 |
84 | +++ libaccounts-glib/ag-manager.c 2016-02-19 10:06:27 +0000 |
85 | @@ -384,7 +384,7 @@ |
86 | GList *file_list; |
87 | const gchar * const *dirs; |
88 | const gchar *env_dirname, *datadir; |
89 | - gchar *dirname; |
90 | + gchar *dirname, *desktop_override = NULL; |
91 | |
92 | loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, |
93 | g_free, NULL); |
94 | @@ -407,9 +407,23 @@ |
95 | g_free (dirname); |
96 | } |
97 | |
98 | + /* Check what desktop is this running on */ |
99 | + env_dirname = g_getenv ("XDG_CURRENT_DESKTOP"); |
100 | + if (env_dirname) |
101 | + desktop_override = g_ascii_strdown (env_dirname, -1); |
102 | + |
103 | dirs = g_get_system_data_dirs (); |
104 | for (datadir = *dirs; datadir != NULL; dirs++, datadir = *dirs) |
105 | { |
106 | + /* Check first if desktop override files exist and if yes, load them first */ |
107 | + if (desktop_override) |
108 | + { |
109 | + dirname = g_build_filename (datadir, subdir, desktop_override, NULL); |
110 | + add_data_files_from_dir (manager, dirname, loaded_files, suffix, |
111 | + load_file_func); |
112 | + g_free (dirname); |
113 | + } |
114 | + |
115 | dirname = g_build_filename (datadir, subdir, NULL); |
116 | add_data_files_from_dir (manager, dirname, loaded_files, suffix, |
117 | load_file_func); |
118 | @@ -419,6 +433,7 @@ |
119 | finish: |
120 | file_list = g_hash_table_get_values (loaded_files); |
121 | g_hash_table_unref (loaded_files); |
122 | + g_free (desktop_override); |
123 | |
124 | return file_list; |
125 | } |
126 | |
127 | === modified file 'libaccounts-glib/ag-util.c' |
128 | --- libaccounts-glib/ag-util.c 2014-01-03 13:25:25 +0000 |
129 | +++ libaccounts-glib/ag-util.c 2016-02-19 10:06:27 +0000 |
130 | @@ -577,7 +577,7 @@ |
131 | const gchar * const *dirs; |
132 | const gchar *dirname; |
133 | const gchar *env_dirname; |
134 | - gchar *filename, *filepath; |
135 | + gchar *filename, *filepath, *desktop_override = NULL; |
136 | |
137 | filename = g_strconcat (file_id, suffix, NULL); |
138 | env_dirname = g_getenv (env_var); |
139 | @@ -598,9 +598,22 @@ |
140 | g_free (filepath); |
141 | } |
142 | |
143 | + /* Check what desktop is this running on */ |
144 | + env_dirname = g_getenv ("XDG_CURRENT_DESKTOP"); |
145 | + if (env_dirname) |
146 | + desktop_override = g_ascii_strdown (env_dirname, -1); |
147 | + |
148 | dirs = g_get_system_data_dirs (); |
149 | for (dirname = *dirs; dirname != NULL; dirs++, dirname = *dirs) |
150 | { |
151 | + /* Check first if desktop override files exist and if yes, load them first */ |
152 | + if (desktop_override) |
153 | + { |
154 | + filepath = g_build_filename (dirname, subdir, desktop_override, filename, NULL); |
155 | + if (g_file_test (filepath, G_FILE_TEST_IS_REGULAR)) |
156 | + goto found; |
157 | + g_free (filepath); |
158 | + } |
159 | filepath = g_build_filename (dirname, subdir, filename, NULL); |
160 | if (g_file_test (filepath, G_FILE_TEST_IS_REGULAR)) |
161 | goto found; |
162 | @@ -609,6 +622,7 @@ |
163 | |
164 | filepath = NULL; |
165 | found: |
166 | + g_free (desktop_override); |
167 | g_free (filename); |
168 | return filepath; |
169 | } |
170 | |
171 | === removed file 'tests/Gallery.application' |
172 | --- tests/Gallery.application 2012-01-31 08:04:15 +0000 |
173 | +++ tests/Gallery.application 1970-01-01 00:00:00 +0000 |
174 | @@ -1,17 +0,0 @@ |
175 | -<?xml version="1.0" encoding="UTF-8" ?> |
176 | -<application id="Gallery"> |
177 | - <description>Image gallery</description> |
178 | - |
179 | - <services> |
180 | - <service id="OtherService"> |
181 | - <description>Publish images on OtherService</description> |
182 | - </service> |
183 | - </services> |
184 | - |
185 | - <service-types> |
186 | - <service-type id="sharing"> |
187 | - <description>Share your images with your friends</description> |
188 | - </service-type> |
189 | - </service-types> |
190 | - |
191 | -</application> |
192 | |
193 | === removed file 'tests/Mailer.application' |
194 | --- tests/Mailer.application 2012-01-31 08:04:15 +0000 |
195 | +++ tests/Mailer.application 1970-01-01 00:00:00 +0000 |
196 | @@ -1,12 +0,0 @@ |
197 | -<?xml version="1.0" encoding="UTF-8" ?> |
198 | -<application id="Mailer"> |
199 | - <description>Mailer application</description> |
200 | - <translations>mailer-catalog</translations> |
201 | - |
202 | - <service-types> |
203 | - <service-type id="e-mail"> |
204 | - <description>Mailer can retrieve your e-mails</description> |
205 | - </service-type> |
206 | - </service-types> |
207 | - |
208 | -</application> |
209 | |
210 | === modified file 'tests/Makefile.am' |
211 | --- tests/Makefile.am 2014-10-31 15:33:52 +0000 |
212 | +++ tests/Makefile.am 2016-02-19 10:06:27 +0000 |
213 | @@ -1,5 +1,7 @@ |
214 | ## Process this file with automake to produce Makefile.in |
215 | |
216 | +SUBDIRS = data |
217 | + |
218 | AM_CPPFLAGS = -I$(top_srcdir) |
219 | |
220 | test_PROGRAMS = \ |
221 | @@ -52,7 +54,7 @@ |
222 | |
223 | TESTS_ENVIRONMENT = \ |
224 | DTDDIR=$(top_srcdir)/libaccounts-glib/; export DTDDIR; \ |
225 | - TESTDATADIR=$(top_srcdir)/tests/; export TESTDATADIR; \ |
226 | + TESTDATADIR=$(top_srcdir)/tests/data; export TESTDATADIR; \ |
227 | TESTDIR=$(top_srcdir)/tests/; export TESTDIR; \ |
228 | XMLLINT=$(XMLLINT); export XMLLINT; \ |
229 | abs_top_builddir=$(abs_top_builddir); export abs_top_builddir; |
230 | @@ -72,19 +74,6 @@ |
231 | test_DATA = \ |
232 | tests.xml |
233 | |
234 | -dist_testdata_DATA = \ |
235 | - e-mail.service-type \ |
236 | - Gallery.application \ |
237 | - Mailer.application \ |
238 | - MyProvider.provider \ |
239 | - MyService.service \ |
240 | - MyService2.service \ |
241 | - OtherService.service \ |
242 | - maemo.provider |
243 | - |
244 | -nobase_dist_testdata_DATA = \ |
245 | - applications/Mailer.desktop |
246 | - |
247 | installcheck-local: $(TESTS) |
248 | cd "$(testdir)" && TESTDATADIR="$(testdatadir)" ./accounts-glib-test.sh |
249 | |
250 | |
251 | === removed file 'tests/MyProvider.provider' |
252 | --- tests/MyProvider.provider 2013-10-15 11:49:25 +0000 |
253 | +++ tests/MyProvider.provider 1970-01-01 00:00:00 +0000 |
254 | @@ -1,19 +0,0 @@ |
255 | -<?xml version="1.0" encoding="UTF-8" ?> |
256 | -<provider id="MyProvider"> |
257 | - <name>My Provider</name> |
258 | - <description>My Provider Description</description> |
259 | - <translations>provider_i18n</translations> |
260 | - <icon>general_myprovider</icon> |
261 | - <domains>.*provider\.com</domains> |
262 | - <plugin>oauth2</plugin> |
263 | - <single-account>true</single-account> |
264 | - |
265 | - <!-- default settings (account settings have precedence over these) --> |
266 | - <template> |
267 | - <group name="login"> |
268 | - <setting name="server">login.example.com</setting> |
269 | - <setting name="remember-me" type="b">true</setting> |
270 | - </group> |
271 | - <setting name="color">green</setting> |
272 | - </template> |
273 | -</provider> |
274 | |
275 | === removed file 'tests/MyService.service' |
276 | --- tests/MyService.service 2013-10-15 11:49:25 +0000 |
277 | +++ tests/MyService.service 1970-01-01 00:00:00 +0000 |
278 | @@ -1,22 +0,0 @@ |
279 | -<?xml version="1.0" encoding="UTF-8" ?> |
280 | -<service id="MyService"> |
281 | - <type>e-mail</type> |
282 | - <name>My Service</name> |
283 | - <description>My Service Description</description> |
284 | - <icon>general_myservice</icon> |
285 | - <provider>maemo</provider> |
286 | - <translations>myservice_i18n</translations> |
287 | - |
288 | - <!-- default settings (account settings have precedence over these) --> |
289 | - <template> |
290 | - <group name="parameters"> |
291 | - <setting name="server">talk.google.com</setting> |
292 | - <setting name="port" type="i">5223</setting> |
293 | - <setting name="old-ssl" type="b">true</setting> |
294 | - <setting name="fallback-conference-server">conference.jabber.org</setting> |
295 | - <setting name="capabilities" type="as">["chat", "file", "smileys"]</setting> |
296 | - </group> |
297 | - <setting name="enabled" type="b">true</setting> |
298 | - </template> |
299 | - |
300 | -</service> |
301 | |
302 | === removed file 'tests/MyService2.service' |
303 | --- tests/MyService2.service 2011-06-30 07:25:14 +0000 |
304 | +++ tests/MyService2.service 1970-01-01 00:00:00 +0000 |
305 | @@ -1,15 +0,0 @@ |
306 | -<?xml version="1.0" encoding="UTF-8" ?> |
307 | -<service id="MyService2"> |
308 | - <type>calendar</type> |
309 | - <name>My Service #2</name> |
310 | - <icon>general_myservice2</icon> |
311 | - <provider>maemo</provider> |
312 | - |
313 | - <!-- default settings (account settings have precedence over these) --> |
314 | - <template> |
315 | - <group name="parameters"> |
316 | - <setting name="server">youtube.com</setting> |
317 | - </group> |
318 | - </template> |
319 | - |
320 | -</service> |
321 | |
322 | === removed file 'tests/OtherService.service' |
323 | --- tests/OtherService.service 2012-10-10 15:00:00 +0000 |
324 | +++ tests/OtherService.service 1970-01-01 00:00:00 +0000 |
325 | @@ -1,22 +0,0 @@ |
326 | -<?xml version="1.0" encoding="UTF-8" ?> |
327 | -<service id="OtherService"> |
328 | - <type>sharing</type> |
329 | - <name>Other Service</name> |
330 | - <icon>general_otherservice</icon> |
331 | - <provider>other_provider</provider> |
332 | - <tags> |
333 | - <tag>video</tag> |
334 | - <tag>sharing</tag> |
335 | - </tags> |
336 | - |
337 | - <!-- default settings (account settings have precedence over these) --> |
338 | - <template> |
339 | - <group name="parameters"> |
340 | - <setting name="server">talk.google.com</setting> |
341 | - <setting name="port" type="i">5223</setting> |
342 | - <setting name="old-ssl" type="b">true</setting> |
343 | - <setting name="fallback-conference-server">conference.jabber.org</setting> |
344 | - </group> |
345 | - </template> |
346 | - |
347 | -</service> |
348 | |
349 | === modified file 'tests/accounts-glib-test.sh' |
350 | --- tests/accounts-glib-test.sh 2014-01-03 16:33:07 +0000 |
351 | +++ tests/accounts-glib-test.sh 2016-02-19 10:06:27 +0000 |
352 | @@ -1,9 +1,9 @@ |
353 | #!/bin/sh |
354 | |
355 | -export AG_APPLICATIONS=$TESTDATADIR |
356 | -export AG_SERVICES=$TESTDATADIR |
357 | -export AG_SERVICE_TYPES=$TESTDATADIR |
358 | -export AG_PROVIDERS=$TESTDATADIR |
359 | +export AG_APPLICATIONS=$TESTDATADIR/accounts/applications |
360 | +export AG_SERVICES=$TESTDATADIR/accounts/services |
361 | +export AG_SERVICE_TYPES=$TESTDATADIR/accounts/service-types |
362 | +export AG_PROVIDERS=$TESTDATADIR/accounts/providers |
363 | export ACCOUNTS=/tmp/ |
364 | export AG_DEBUG=all |
365 | export G_MESSAGES_DEBUG=all |
366 | |
367 | === removed directory 'tests/applications' |
368 | === removed file 'tests/applications/Mailer.desktop' |
369 | --- tests/applications/Mailer.desktop 2013-06-14 08:26:06 +0000 |
370 | +++ tests/applications/Mailer.desktop 1970-01-01 00:00:00 +0000 |
371 | @@ -1,8 +0,0 @@ |
372 | -[Desktop Entry] |
373 | -Name=Easy Mailer |
374 | -Comment=Send and receive mail |
375 | -Exec=/bin/sh |
376 | -Icon=mailer-icon |
377 | -Terminal=false |
378 | -Type=Application |
379 | -Categories=Application;Network;Email; |
380 | |
381 | === modified file 'tests/check_ag.c' |
382 | --- tests/check_ag.c 2015-12-17 10:47:26 +0000 |
383 | +++ tests/check_ag.c 2016-02-19 10:06:27 +0000 |
384 | @@ -416,6 +416,56 @@ |
385 | } |
386 | END_TEST |
387 | |
388 | +START_TEST(test_provider_directories) |
389 | +{ |
390 | + AgProvider *provider; |
391 | + gchar *ag_providers_env; |
392 | + gchar *xdg_data_home_env, *xdg_data_dirs_env; |
393 | + |
394 | + /* Unset the AG_PROVIDERS environment variable, just for this test, as |
395 | + * that disables the fallback mechanism which we now want to test. */ |
396 | + ag_providers_env = g_strdup (g_getenv ("AG_PROVIDERS")); |
397 | + g_unsetenv ("AG_PROVIDERS"); |
398 | + /* Disable also XDG_DATA_HOME, but reuse its value for XDG_DATA_DIRS |
399 | + * which is where the fallback mechanism is implemented. */ |
400 | + xdg_data_home_env = g_strdup (g_getenv ("XDG_DATA_HOME")); |
401 | + g_unsetenv ("XDG_DATA_HOME"); |
402 | + g_setenv ("XDG_DATA_DIRS", xdg_data_home_env, TRUE); |
403 | + |
404 | + /* check that the expected MyProvider file is loaded */ |
405 | + g_unsetenv ("XDG_CURRENT_DESKTOP"); |
406 | + manager = ag_manager_new (); |
407 | + |
408 | + provider = ag_manager_get_provider (manager, "MyProvider"); |
409 | + fail_unless (provider != NULL); |
410 | + ck_assert_str_eq (ag_provider_get_name (provider), "MyProvider"); |
411 | + ck_assert_str_eq (ag_provider_get_display_name (provider), "My Provider"); |
412 | + |
413 | + ag_provider_unref (provider); |
414 | + g_object_unref (manager); |
415 | + |
416 | + /* Now check a desktop-specific override */ |
417 | + g_setenv ("XDG_CURRENT_DESKTOP", "Fake-OS", TRUE); |
418 | + manager = ag_manager_new (); |
419 | + |
420 | + provider = ag_manager_get_provider (manager, "MyProvider"); |
421 | + fail_unless (provider != NULL); |
422 | + ck_assert_str_eq (ag_provider_get_name (provider), "MyProvider"); |
423 | + ck_assert_str_eq (ag_provider_get_display_name (provider), "FakeOs Provider"); |
424 | + |
425 | + ag_provider_unref (provider); |
426 | + g_object_unref (manager); |
427 | + |
428 | + g_unsetenv ("XDG_DATA_DIRS"); |
429 | + g_setenv ("XDG_DATA_HOME", xdg_data_home_env, TRUE); |
430 | + g_free (xdg_data_home_env); |
431 | + g_setenv ("AG_PROVIDERS", ag_providers_env, TRUE); |
432 | + g_free (ag_providers_env); |
433 | + manager = NULL; |
434 | + end_test (); |
435 | +} |
436 | +END_TEST |
437 | + |
438 | void account_store_cb (AgAccount *account, const GError *error, |
439 | gpointer user_data) |
440 | { |
441 | @@ -3951,6 +4001,7 @@ |
442 | tc = tcase_create("Provider"); |
443 | tcase_add_test (tc, test_provider); |
444 | tcase_add_test (tc, test_provider_settings); |
445 | + tcase_add_test (tc, test_provider_directories); |
446 | IF_TEST_CASE_ENABLED("Provider") |
447 | suite_add_tcase (s, tc); |
448 | |
449 | |
450 | === added directory 'tests/data' |
451 | === added file 'tests/data/Makefile.am' |
452 | --- tests/data/Makefile.am 1970-01-01 00:00:00 +0000 |
453 | +++ tests/data/Makefile.am 2016-02-19 10:06:27 +0000 |
454 | @@ -0,0 +1,11 @@ |
455 | +nobase_dist_testdata_DATA = \ |
456 | + accounts/applications/Gallery.application \ |
457 | + accounts/applications/Mailer.application \ |
458 | + accounts/providers/MyProvider.provider \ |
459 | + accounts/providers/fake-os/MyProvider.provider \ |
460 | + accounts/providers/maemo.provider \ |
461 | + accounts/service-types/e-mail.service-type \ |
462 | + accounts/services/MyService.service \ |
463 | + accounts/services/MyService2.service \ |
464 | + accounts/services/OtherService.service \ |
465 | + applications/Mailer.desktop |
466 | |
467 | === added directory 'tests/data/accounts' |
468 | === added directory 'tests/data/accounts/applications' |
469 | === added file 'tests/data/accounts/applications/Gallery.application' |
470 | --- tests/data/accounts/applications/Gallery.application 1970-01-01 00:00:00 +0000 |
471 | +++ tests/data/accounts/applications/Gallery.application 2016-02-19 10:06:27 +0000 |
472 | @@ -0,0 +1,17 @@ |
473 | +<?xml version="1.0" encoding="UTF-8" ?> |
474 | +<application id="Gallery"> |
475 | + <description>Image gallery</description> |
476 | + |
477 | + <services> |
478 | + <service id="OtherService"> |
479 | + <description>Publish images on OtherService</description> |
480 | + </service> |
481 | + </services> |
482 | + |
483 | + <service-types> |
484 | + <service-type id="sharing"> |
485 | + <description>Share your images with your friends</description> |
486 | + </service-type> |
487 | + </service-types> |
488 | + |
489 | +</application> |
490 | |
491 | === added file 'tests/data/accounts/applications/Mailer.application' |
492 | --- tests/data/accounts/applications/Mailer.application 1970-01-01 00:00:00 +0000 |
493 | +++ tests/data/accounts/applications/Mailer.application 2016-02-19 10:06:27 +0000 |
494 | @@ -0,0 +1,12 @@ |
495 | +<?xml version="1.0" encoding="UTF-8" ?> |
496 | +<application id="Mailer"> |
497 | + <description>Mailer application</description> |
498 | + <translations>mailer-catalog</translations> |
499 | + |
500 | + <service-types> |
501 | + <service-type id="e-mail"> |
502 | + <description>Mailer can retrieve your e-mails</description> |
503 | + </service-type> |
504 | + </service-types> |
505 | + |
506 | +</application> |
507 | |
508 | === added directory 'tests/data/accounts/providers' |
509 | === added file 'tests/data/accounts/providers/MyProvider.provider' |
510 | --- tests/data/accounts/providers/MyProvider.provider 1970-01-01 00:00:00 +0000 |
511 | +++ tests/data/accounts/providers/MyProvider.provider 2016-02-19 10:06:27 +0000 |
512 | @@ -0,0 +1,19 @@ |
513 | +<?xml version="1.0" encoding="UTF-8" ?> |
514 | +<provider id="MyProvider"> |
515 | + <name>My Provider</name> |
516 | + <description>My Provider Description</description> |
517 | + <translations>provider_i18n</translations> |
518 | + <icon>general_myprovider</icon> |
519 | + <domains>.*provider\.com</domains> |
520 | + <plugin>oauth2</plugin> |
521 | + <single-account>true</single-account> |
522 | + |
523 | + <!-- default settings (account settings have precedence over these) --> |
524 | + <template> |
525 | + <group name="login"> |
526 | + <setting name="server">login.example.com</setting> |
527 | + <setting name="remember-me" type="b">true</setting> |
528 | + </group> |
529 | + <setting name="color">green</setting> |
530 | + </template> |
531 | +</provider> |
532 | |
533 | === added directory 'tests/data/accounts/providers/fake-os' |
534 | === added file 'tests/data/accounts/providers/fake-os/MyProvider.provider' |
535 | --- tests/data/accounts/providers/fake-os/MyProvider.provider 1970-01-01 00:00:00 +0000 |
536 | +++ tests/data/accounts/providers/fake-os/MyProvider.provider 2016-02-19 10:06:27 +0000 |
537 | @@ -0,0 +1,8 @@ |
538 | +<?xml version="1.0" encoding="UTF-8" ?> |
539 | +<provider id="MyProvider"> |
540 | + <name>FakeOs Provider</name> |
541 | + <description>My Provider Description</description> |
542 | + <translations>provider_i18n</translations> |
543 | + <icon>general_myprovider</icon> |
544 | + <domains>.*provider\.com</domains> |
545 | +</provider> |
546 | |
547 | === added file 'tests/data/accounts/providers/maemo.provider' |
548 | --- tests/data/accounts/providers/maemo.provider 1970-01-01 00:00:00 +0000 |
549 | +++ tests/data/accounts/providers/maemo.provider 2016-02-19 10:06:27 +0000 |
550 | @@ -0,0 +1,17 @@ |
551 | +<?xml version="1.0" encoding="UTF-8" ?> |
552 | +<provider id="maemo"> |
553 | + <name>Example provider</name> |
554 | + <description>An example provider</description> |
555 | + <icon>example</icon> |
556 | + <domains>.*example\.com</domains> |
557 | + <!-- default settings (account settings have precedence over these) --> |
558 | + <template> |
559 | + <setting name="auth/method">dummy-method</setting> |
560 | + <setting name="auth/mechanism">dummy-mechanism</setting> |
561 | + <group name="auth/dummy-method/dummy-mechanism"> |
562 | + <setting name="id">879</setting> |
563 | + <setting name="display">desktop</setting> |
564 | + <setting name="from-provider">yes</setting> |
565 | + </group> |
566 | + </template> |
567 | +</provider> |
568 | |
569 | === added directory 'tests/data/accounts/service-types' |
570 | === added file 'tests/data/accounts/service-types/e-mail.service-type' |
571 | --- tests/data/accounts/service-types/e-mail.service-type 1970-01-01 00:00:00 +0000 |
572 | +++ tests/data/accounts/service-types/e-mail.service-type 2016-02-19 10:06:27 +0000 |
573 | @@ -0,0 +1,11 @@ |
574 | +<?xml version="1.0" encoding="UTF-8" ?> |
575 | +<service-type id="e-mail"> |
576 | + <name>Electronic mail</name> |
577 | + <description>Electronic mail description</description> |
578 | + <icon>email_icon</icon> |
579 | + <translations>translation_file</translations> |
580 | + <tags> |
581 | + <tag>e-mail</tag> |
582 | + <tag>messaging</tag> |
583 | + </tags> |
584 | +</service-type> |
585 | |
586 | === added directory 'tests/data/accounts/services' |
587 | === added file 'tests/data/accounts/services/MyService.service' |
588 | --- tests/data/accounts/services/MyService.service 1970-01-01 00:00:00 +0000 |
589 | +++ tests/data/accounts/services/MyService.service 2016-02-19 10:06:27 +0000 |
590 | @@ -0,0 +1,22 @@ |
591 | +<?xml version="1.0" encoding="UTF-8" ?> |
592 | +<service id="MyService"> |
593 | + <type>e-mail</type> |
594 | + <name>My Service</name> |
595 | + <description>My Service Description</description> |
596 | + <icon>general_myservice</icon> |
597 | + <provider>maemo</provider> |
598 | + <translations>myservice_i18n</translations> |
599 | + |
600 | + <!-- default settings (account settings have precedence over these) --> |
601 | + <template> |
602 | + <group name="parameters"> |
603 | + <setting name="server">talk.google.com</setting> |
604 | + <setting name="port" type="i">5223</setting> |
605 | + <setting name="old-ssl" type="b">true</setting> |
606 | + <setting name="fallback-conference-server">conference.jabber.org</setting> |
607 | + <setting name="capabilities" type="as">["chat", "file", "smileys"]</setting> |
608 | + </group> |
609 | + <setting name="enabled" type="b">true</setting> |
610 | + </template> |
611 | + |
612 | +</service> |
613 | |
614 | === added file 'tests/data/accounts/services/MyService2.service' |
615 | --- tests/data/accounts/services/MyService2.service 1970-01-01 00:00:00 +0000 |
616 | +++ tests/data/accounts/services/MyService2.service 2016-02-19 10:06:27 +0000 |
617 | @@ -0,0 +1,15 @@ |
618 | +<?xml version="1.0" encoding="UTF-8" ?> |
619 | +<service id="MyService2"> |
620 | + <type>calendar</type> |
621 | + <name>My Service #2</name> |
622 | + <icon>general_myservice2</icon> |
623 | + <provider>maemo</provider> |
624 | + |
625 | + <!-- default settings (account settings have precedence over these) --> |
626 | + <template> |
627 | + <group name="parameters"> |
628 | + <setting name="server">youtube.com</setting> |
629 | + </group> |
630 | + </template> |
631 | + |
632 | +</service> |
633 | |
634 | === added file 'tests/data/accounts/services/OtherService.service' |
635 | --- tests/data/accounts/services/OtherService.service 1970-01-01 00:00:00 +0000 |
636 | +++ tests/data/accounts/services/OtherService.service 2016-02-19 10:06:27 +0000 |
637 | @@ -0,0 +1,22 @@ |
638 | +<?xml version="1.0" encoding="UTF-8" ?> |
639 | +<service id="OtherService"> |
640 | + <type>sharing</type> |
641 | + <name>Other Service</name> |
642 | + <icon>general_otherservice</icon> |
643 | + <provider>other_provider</provider> |
644 | + <tags> |
645 | + <tag>video</tag> |
646 | + <tag>sharing</tag> |
647 | + </tags> |
648 | + |
649 | + <!-- default settings (account settings have precedence over these) --> |
650 | + <template> |
651 | + <group name="parameters"> |
652 | + <setting name="server">talk.google.com</setting> |
653 | + <setting name="port" type="i">5223</setting> |
654 | + <setting name="old-ssl" type="b">true</setting> |
655 | + <setting name="fallback-conference-server">conference.jabber.org</setting> |
656 | + </group> |
657 | + </template> |
658 | + |
659 | +</service> |
660 | |
661 | === added directory 'tests/data/applications' |
662 | === added file 'tests/data/applications/Mailer.desktop' |
663 | --- tests/data/applications/Mailer.desktop 1970-01-01 00:00:00 +0000 |
664 | +++ tests/data/applications/Mailer.desktop 2016-02-19 10:06:27 +0000 |
665 | @@ -0,0 +1,8 @@ |
666 | +[Desktop Entry] |
667 | +Name=Easy Mailer |
668 | +Comment=Send and receive mail |
669 | +Exec=/bin/sh |
670 | +Icon=mailer-icon |
671 | +Terminal=false |
672 | +Type=Application |
673 | +Categories=Application;Network;Email; |
674 | |
675 | === removed file 'tests/e-mail.service-type' |
676 | --- tests/e-mail.service-type 2012-10-10 14:59:58 +0000 |
677 | +++ tests/e-mail.service-type 1970-01-01 00:00:00 +0000 |
678 | @@ -1,11 +0,0 @@ |
679 | -<?xml version="1.0" encoding="UTF-8" ?> |
680 | -<service-type id="e-mail"> |
681 | - <name>Electronic mail</name> |
682 | - <description>Electronic mail description</description> |
683 | - <icon>email_icon</icon> |
684 | - <translations>translation_file</translations> |
685 | - <tags> |
686 | - <tag>e-mail</tag> |
687 | - <tag>messaging</tag> |
688 | - </tags> |
689 | -</service-type> |
690 | |
691 | === removed file 'tests/maemo.provider' |
692 | --- tests/maemo.provider 2013-01-23 13:09:21 +0000 |
693 | +++ tests/maemo.provider 1970-01-01 00:00:00 +0000 |
694 | @@ -1,17 +0,0 @@ |
695 | -<?xml version="1.0" encoding="UTF-8" ?> |
696 | -<provider id="maemo"> |
697 | - <name>Example provider</name> |
698 | - <description>An example provider</description> |
699 | - <icon>example</icon> |
700 | - <domains>.*example\.com</domains> |
701 | - <!-- default settings (account settings have precedence over these) --> |
702 | - <template> |
703 | - <setting name="auth/method">dummy-method</setting> |
704 | - <setting name="auth/mechanism">dummy-mechanism</setting> |
705 | - <group name="auth/dummy-method/dummy-mechanism"> |
706 | - <setting name="id">879</setting> |
707 | - <setting name="display">desktop</setting> |
708 | - <setting name="from-provider">yes</setting> |
709 | - </group> |
710 | - </template> |
711 | -</provider> |
712 | |
713 | === modified file 'tests/xml-dtd-validate.sh' |
714 | --- tests/xml-dtd-validate.sh 2012-10-17 14:14:08 +0000 |
715 | +++ tests/xml-dtd-validate.sh 2016-02-19 10:06:27 +0000 |
716 | @@ -7,16 +7,16 @@ |
717 | |
718 | for application in $applications |
719 | do |
720 | - ${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-application.dtd ${TESTDATADIR}$application || exit 1 |
721 | + ${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-application.dtd ${TESTDATADIR}/accounts/applications/$application || exit 1 |
722 | done |
723 | |
724 | -${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-provider.dtd ${TESTDATADIR}MyProvider.provider |
725 | +${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-provider.dtd ${TESTDATADIR}/accounts/providers/MyProvider.provider |
726 | |
727 | services="MyService.service MyService2.service OtherService.service" |
728 | |
729 | for service in $services |
730 | do |
731 | - ${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service.dtd ${TESTDATADIR}$service || exit 1 |
732 | + ${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service.dtd ${TESTDATADIR}/accounts/services/$service || exit 1 |
733 | done |
734 | |
735 | -${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service-type.dtd ${TESTDATADIR}e-mail.service-type |
736 | +${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service-type.dtd ${TESTDATADIR}/accounts/service-types/e-mail.service-type |