Merge lp:~online-accounts/libaccounts-glib/packaging into lp:libaccounts-glib

[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

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

[lp:~online-accounts/libaccounts-glib/packaging]

194. By Alberto Mardegan on 2016-02-22

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

=== modified file 'NEWS'
--- NEWS	2014-09-01 13:14:34 +0000
+++ NEWS	2016-02-19 10:06:27 +0000
@@ -1,5 +1,34 @@
 libaccounts-glib NEWS
 
+Version 1.21
+------------
+
+* Fix installation of test data files
+
+Version 1.20
+------------
+
+* 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.
+* Fix endianness issues
+  https://gitlab.com/accounts-sso/libaccounts-glib/issues/2
+
+Version 1.19
+------------
+
+* Build: ignore deprecations of GSimpleAsyncResult
+* Build: don't emit a build error on deprecations
+* Coverage: allow lcov versions up to 1.11
+* Build: fix handling of coverage flags
+* Build: fix build errors when building with clang
+* Update account ID after a remotely-executed store
+* Vala: add allow-none and update VAPI file
+  https://code.google.com/p/accounts-sso/issues/detail?id=241
+* Build: multiarch fixes
+
 Version 1.18
 ------------
 
 
=== modified file 'configure.ac'
--- configure.ac	2015-12-08 14:43:26 +0000
+++ configure.ac	2016-02-19 10:06:27 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libaccounts-glib],
-        [1.19],
+        [1.21],
         [https://gitlab.com/accounts-sso/libaccounts-glib/issues],
         [libaccounts-glib],
         [https://gitlab.com/accounts-sso/libaccounts-glib])
@@ -190,6 +190,7 @@
 	docs/reference/version.xml
 	pygobject/Makefile
 	tests/Makefile
+	tests/data/Makefile
 	tools/Makefile
 ])
 AC_OUTPUT
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-21 08:57:49 +0000
+++ debian/changelog	2016-02-19 10:06:27 +0000
@@ -1,3 +1,16 @@
+libaccounts-glib (1.21-0ubuntu1) UNRELEASED; urgency=medium
+
+  * 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
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 19 Feb 2016 13:00:19 +0300
+
 libaccounts-glib (1.19+16.04.20151221-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'libaccounts-glib/ag-manager.c'
--- libaccounts-glib/ag-manager.c	2015-12-18 15:16:14 +0000
+++ libaccounts-glib/ag-manager.c	2016-02-19 10:06:27 +0000
@@ -384,7 +384,7 @@
     GList *file_list;
     const gchar * const *dirs;
     const gchar *env_dirname, *datadir;
-    gchar *dirname;
+    gchar *dirname, *desktop_override = NULL;
 
     loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal,
                                           g_free, NULL);
@@ -407,9 +407,23 @@
         g_free (dirname);
     }
 
+    /* Check what desktop is this running on */
+    env_dirname = g_getenv ("XDG_CURRENT_DESKTOP");
+    if (env_dirname)
+        desktop_override = g_ascii_strdown (env_dirname, -1);
+
     dirs = g_get_system_data_dirs ();
     for (datadir = *dirs; datadir != NULL; dirs++, datadir = *dirs)
     {
+        /* Check first if desktop override files exist and if yes, load them first */
+        if (desktop_override)
+        {
+            dirname = g_build_filename (datadir, subdir, desktop_override, NULL);
+            add_data_files_from_dir (manager, dirname, loaded_files, suffix,
+                                     load_file_func);
+            g_free (dirname);
+        }
+
         dirname = g_build_filename (datadir, subdir, NULL);
         add_data_files_from_dir (manager, dirname, loaded_files, suffix,
                                  load_file_func);
@@ -419,6 +433,7 @@
 finish:
     file_list = g_hash_table_get_values (loaded_files);
     g_hash_table_unref (loaded_files);
+    g_free (desktop_override);
 
     return file_list;
 }
 
=== modified file 'libaccounts-glib/ag-util.c'
--- libaccounts-glib/ag-util.c	2014-01-03 13:25:25 +0000
+++ libaccounts-glib/ag-util.c	2016-02-19 10:06:27 +0000
@@ -577,7 +577,7 @@
     const gchar * const *dirs;
     const gchar *dirname;
     const gchar *env_dirname;
-    gchar *filename, *filepath;
+    gchar *filename, *filepath, *desktop_override = NULL;
 
     filename = g_strconcat (file_id, suffix, NULL);
     env_dirname = g_getenv (env_var);
@@ -598,9 +598,22 @@
         g_free (filepath);
     }
 
+    /* Check what desktop is this running on */
+    env_dirname = g_getenv ("XDG_CURRENT_DESKTOP");
+    if (env_dirname)
+        desktop_override = g_ascii_strdown (env_dirname, -1);
+
     dirs = g_get_system_data_dirs ();
     for (dirname = *dirs; dirname != NULL; dirs++, dirname = *dirs)
     {
+        /* Check first if desktop override files exist and if yes, load them first */
+        if (desktop_override)
+        {
+            filepath = g_build_filename (dirname, subdir, desktop_override, filename, NULL);
+            if (g_file_test (filepath, G_FILE_TEST_IS_REGULAR))
+                goto found;
+            g_free (filepath);
+        }
         filepath = g_build_filename (dirname, subdir, filename, NULL);
         if (g_file_test (filepath, G_FILE_TEST_IS_REGULAR))
             goto found;
@@ -609,6 +622,7 @@
 
     filepath = NULL;
 found:
+    g_free (desktop_override);
     g_free (filename);
     return filepath;
 }
 
=== removed file 'tests/Gallery.application'
--- tests/Gallery.application	2012-01-31 08:04:15 +0000
+++ tests/Gallery.application	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="Gallery">
-  <description>Image gallery</description>
-
-  <services>
-		<service id="OtherService">
-			<description>Publish images on OtherService</description>
-		</service>
-  </services>
-
-  <service-types>
-		<service-type id="sharing">
-			<description>Share your images with your friends</description>
-		</service-type>
-  </service-types>
-
-</application>
 
=== removed file 'tests/Mailer.application'
--- tests/Mailer.application	2012-01-31 08:04:15 +0000
+++ tests/Mailer.application	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="Mailer">
-  <description>Mailer application</description>
-  <translations>mailer-catalog</translations>
-
-  <service-types>
-		<service-type id="e-mail">
-			<description>Mailer can retrieve your e-mails</description>
-		</service-type>
-  </service-types>
-
-</application>
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2014-10-31 15:33:52 +0000
+++ tests/Makefile.am	2016-02-19 10:06:27 +0000
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = data
+
 AM_CPPFLAGS = -I$(top_srcdir)
 
 test_PROGRAMS = \
@@ -52,7 +54,7 @@
 
 TESTS_ENVIRONMENT = \
 	DTDDIR=$(top_srcdir)/libaccounts-glib/; export DTDDIR; \
-	TESTDATADIR=$(top_srcdir)/tests/; export TESTDATADIR; \
+	TESTDATADIR=$(top_srcdir)/tests/data; export TESTDATADIR; \
 	TESTDIR=$(top_srcdir)/tests/; export TESTDIR; \
 	XMLLINT=$(XMLLINT); export XMLLINT; \
 	abs_top_builddir=$(abs_top_builddir); export abs_top_builddir;
@@ -72,19 +74,6 @@
 test_DATA = \
 	tests.xml
 
-dist_testdata_DATA = \
-	e-mail.service-type \
-	Gallery.application \
-	Mailer.application \
-	MyProvider.provider \
-	MyService.service \
-	MyService2.service \
-	OtherService.service \
-	maemo.provider
-
-nobase_dist_testdata_DATA = \
-	applications/Mailer.desktop
-
 installcheck-local: $(TESTS)
 	cd "$(testdir)" && TESTDATADIR="$(testdatadir)" ./accounts-glib-test.sh
 
 
=== removed file 'tests/MyProvider.provider'
--- tests/MyProvider.provider	2013-10-15 11:49:25 +0000
+++ tests/MyProvider.provider	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<provider id="MyProvider">
-  <name>My Provider</name>
-  <description>My Provider Description</description>
-  <translations>provider_i18n</translations>
-  <icon>general_myprovider</icon>
-  <domains>.*provider\.com</domains>
-  <plugin>oauth2</plugin>
-  <single-account>true</single-account>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="login">
-      <setting name="server">login.example.com</setting>
-      <setting name="remember-me" type="b">true</setting>
-    </group>
-    <setting name="color">green</setting>
-  </template>
-</provider>
 
=== removed file 'tests/MyService.service'
--- tests/MyService.service	2013-10-15 11:49:25 +0000
+++ tests/MyService.service	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="MyService">
-  <type>e-mail</type>
-  <name>My Service</name>
-  <description>My Service Description</description>
-  <icon>general_myservice</icon>
-  <provider>maemo</provider>
-  <translations>myservice_i18n</translations>
-  
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="parameters">
-      <setting name="server">talk.google.com</setting>
-      <setting name="port" type="i">5223</setting>
-      <setting name="old-ssl" type="b">true</setting>
-      <setting name="fallback-conference-server">conference.jabber.org</setting>
-      <setting name="capabilities" type="as">["chat", "file", "smileys"]</setting>
-    </group>
-    <setting name="enabled" type="b">true</setting>
-  </template>
-
-</service>
 
=== removed file 'tests/MyService2.service'
--- tests/MyService2.service	2011-06-30 07:25:14 +0000
+++ tests/MyService2.service	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="MyService2">
-  <type>calendar</type>
-  <name>My Service #2</name>
-  <icon>general_myservice2</icon>
-  <provider>maemo</provider>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="parameters">
-      <setting name="server">youtube.com</setting>
-    </group>
-  </template>
-
-</service>
 
=== removed file 'tests/OtherService.service'
--- tests/OtherService.service	2012-10-10 15:00:00 +0000
+++ tests/OtherService.service	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="OtherService">
-  <type>sharing</type>
-  <name>Other Service</name>
-  <icon>general_otherservice</icon>
-  <provider>other_provider</provider>
-  <tags>
-      <tag>video</tag>
-      <tag>sharing</tag>
-  </tags>
-  
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="parameters">
-      <setting name="server">talk.google.com</setting>
-      <setting name="port" type="i">5223</setting>
-      <setting name="old-ssl" type="b">true</setting>
-      <setting name="fallback-conference-server">conference.jabber.org</setting>
-    </group>
-  </template>
-
-</service>
 
=== modified file 'tests/accounts-glib-test.sh'
--- tests/accounts-glib-test.sh	2014-01-03 16:33:07 +0000
+++ tests/accounts-glib-test.sh	2016-02-19 10:06:27 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-export AG_APPLICATIONS=$TESTDATADIR
-export AG_SERVICES=$TESTDATADIR
-export AG_SERVICE_TYPES=$TESTDATADIR
-export AG_PROVIDERS=$TESTDATADIR
+export AG_APPLICATIONS=$TESTDATADIR/accounts/applications
+export AG_SERVICES=$TESTDATADIR/accounts/services
+export AG_SERVICE_TYPES=$TESTDATADIR/accounts/service-types
+export AG_PROVIDERS=$TESTDATADIR/accounts/providers
 export ACCOUNTS=/tmp/
 export AG_DEBUG=all
 export G_MESSAGES_DEBUG=all
 
=== removed directory 'tests/applications'
=== removed file 'tests/applications/Mailer.desktop'
--- tests/applications/Mailer.desktop	2013-06-14 08:26:06 +0000
+++ tests/applications/Mailer.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Easy Mailer
-Comment=Send and receive mail
-Exec=/bin/sh
-Icon=mailer-icon
-Terminal=false
-Type=Application
-Categories=Application;Network;Email;
 
=== modified file 'tests/check_ag.c'
--- tests/check_ag.c	2015-12-17 10:47:26 +0000
+++ tests/check_ag.c	2016-02-19 10:06:27 +0000
@@ -416,6 +416,56 @@
 }
 END_TEST
 
+START_TEST(test_provider_directories)
+{
+    AgProvider *provider;
+    gchar *ag_providers_env;
+    gchar *xdg_data_home_env, *xdg_data_dirs_env;
+
+    /* Unset the AG_PROVIDERS environment variable, just for this test, as
+     * that disables the fallback mechanism which we now want to test. */
+    ag_providers_env = g_strdup (g_getenv ("AG_PROVIDERS"));
+    g_unsetenv ("AG_PROVIDERS");
+    /* Disable also XDG_DATA_HOME, but reuse its value for XDG_DATA_DIRS
+     * which is where the fallback mechanism is implemented. */
+    xdg_data_home_env = g_strdup (g_getenv ("XDG_DATA_HOME"));
+    g_unsetenv ("XDG_DATA_HOME");
+    g_setenv ("XDG_DATA_DIRS", xdg_data_home_env, TRUE);
+
+    /* check that the expected MyProvider file is loaded */
+    g_unsetenv ("XDG_CURRENT_DESKTOP");
+    manager = ag_manager_new ();
+
+    provider = ag_manager_get_provider (manager, "MyProvider");
+    fail_unless (provider != NULL);
+    ck_assert_str_eq (ag_provider_get_name (provider), "MyProvider");
+    ck_assert_str_eq (ag_provider_get_display_name (provider), "My Provider");
+
+    ag_provider_unref (provider);
+    g_object_unref (manager);
+
+    /* Now check a desktop-specific override */
+    g_setenv ("XDG_CURRENT_DESKTOP", "Fake-OS", TRUE);
+    manager = ag_manager_new ();
+
+    provider = ag_manager_get_provider (manager, "MyProvider");
+    fail_unless (provider != NULL);
+    ck_assert_str_eq (ag_provider_get_name (provider), "MyProvider");
+    ck_assert_str_eq (ag_provider_get_display_name (provider), "FakeOs Provider");
+
+    ag_provider_unref (provider);
+    g_object_unref (manager);
+
+    g_unsetenv ("XDG_DATA_DIRS");
+    g_setenv ("XDG_DATA_HOME", xdg_data_home_env, TRUE);
+    g_free (xdg_data_home_env);
+    g_setenv ("AG_PROVIDERS", ag_providers_env, TRUE);
+    g_free (ag_providers_env);
+    manager = NULL;
+    end_test ();
+}
+END_TEST
+
 void account_store_cb (AgAccount *account, const GError *error,
                        gpointer user_data)
 {
@@ -3951,6 +4001,7 @@
     tc = tcase_create("Provider");
     tcase_add_test (tc, test_provider);
     tcase_add_test (tc, test_provider_settings);
+    tcase_add_test (tc, test_provider_directories);
     IF_TEST_CASE_ENABLED("Provider")
         suite_add_tcase (s, tc);
 
 
=== added directory 'tests/data'
=== added file 'tests/data/Makefile.am'
--- tests/data/Makefile.am	1970-01-01 00:00:00 +0000
+++ tests/data/Makefile.am	2016-02-19 10:06:27 +0000
@@ -0,0 +1,11 @@
+nobase_dist_testdata_DATA = \
+	accounts/applications/Gallery.application \
+	accounts/applications/Mailer.application \
+	accounts/providers/MyProvider.provider \
+	accounts/providers/fake-os/MyProvider.provider \
+	accounts/providers/maemo.provider \
+	accounts/service-types/e-mail.service-type \
+	accounts/services/MyService.service \
+	accounts/services/MyService2.service \
+	accounts/services/OtherService.service \
+	applications/Mailer.desktop
 
=== added directory 'tests/data/accounts'
=== added directory 'tests/data/accounts/applications'
=== added file 'tests/data/accounts/applications/Gallery.application'
--- tests/data/accounts/applications/Gallery.application	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/applications/Gallery.application	2016-02-19 10:06:27 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="Gallery">
+  <description>Image gallery</description>
+
+  <services>
+		<service id="OtherService">
+			<description>Publish images on OtherService</description>
+		</service>
+  </services>
+
+  <service-types>
+		<service-type id="sharing">
+			<description>Share your images with your friends</description>
+		</service-type>
+  </service-types>
+
+</application>
 
=== added file 'tests/data/accounts/applications/Mailer.application'
--- tests/data/accounts/applications/Mailer.application	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/applications/Mailer.application	2016-02-19 10:06:27 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="Mailer">
+  <description>Mailer application</description>
+  <translations>mailer-catalog</translations>
+
+  <service-types>
+		<service-type id="e-mail">
+			<description>Mailer can retrieve your e-mails</description>
+		</service-type>
+  </service-types>
+
+</application>
 
=== added directory 'tests/data/accounts/providers'
=== added file 'tests/data/accounts/providers/MyProvider.provider'
--- tests/data/accounts/providers/MyProvider.provider	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/providers/MyProvider.provider	2016-02-19 10:06:27 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="MyProvider">
+  <name>My Provider</name>
+  <description>My Provider Description</description>
+  <translations>provider_i18n</translations>
+  <icon>general_myprovider</icon>
+  <domains>.*provider\.com</domains>
+  <plugin>oauth2</plugin>
+  <single-account>true</single-account>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="login">
+      <setting name="server">login.example.com</setting>
+      <setting name="remember-me" type="b">true</setting>
+    </group>
+    <setting name="color">green</setting>
+  </template>
+</provider>
 
=== added directory 'tests/data/accounts/providers/fake-os'
=== added file 'tests/data/accounts/providers/fake-os/MyProvider.provider'
--- tests/data/accounts/providers/fake-os/MyProvider.provider	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/providers/fake-os/MyProvider.provider	2016-02-19 10:06:27 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="MyProvider">
+  <name>FakeOs Provider</name>
+  <description>My Provider Description</description>
+  <translations>provider_i18n</translations>
+  <icon>general_myprovider</icon>
+  <domains>.*provider\.com</domains>
+</provider>
 
=== added file 'tests/data/accounts/providers/maemo.provider'
--- tests/data/accounts/providers/maemo.provider	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/providers/maemo.provider	2016-02-19 10:06:27 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="maemo">
+  <name>Example provider</name>
+  <description>An example provider</description>
+  <icon>example</icon>
+  <domains>.*example\.com</domains>
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <setting name="auth/method">dummy-method</setting>
+    <setting name="auth/mechanism">dummy-mechanism</setting>
+    <group name="auth/dummy-method/dummy-mechanism">
+      <setting name="id">879</setting>
+      <setting name="display">desktop</setting>
+      <setting name="from-provider">yes</setting>
+    </group>
+  </template>
+</provider>
 
=== added directory 'tests/data/accounts/service-types'
=== added file 'tests/data/accounts/service-types/e-mail.service-type'
--- tests/data/accounts/service-types/e-mail.service-type	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/service-types/e-mail.service-type	2016-02-19 10:06:27 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service-type id="e-mail">
+  <name>Electronic mail</name>
+  <description>Electronic mail description</description>
+  <icon>email_icon</icon>
+  <translations>translation_file</translations>
+  <tags>
+      <tag>e-mail</tag>
+      <tag>messaging</tag>
+  </tags>
+</service-type>
 
=== added directory 'tests/data/accounts/services'
=== added file 'tests/data/accounts/services/MyService.service'
--- tests/data/accounts/services/MyService.service	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/services/MyService.service	2016-02-19 10:06:27 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="MyService">
+  <type>e-mail</type>
+  <name>My Service</name>
+  <description>My Service Description</description>
+  <icon>general_myservice</icon>
+  <provider>maemo</provider>
+  <translations>myservice_i18n</translations>
+  
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="parameters">
+      <setting name="server">talk.google.com</setting>
+      <setting name="port" type="i">5223</setting>
+      <setting name="old-ssl" type="b">true</setting>
+      <setting name="fallback-conference-server">conference.jabber.org</setting>
+      <setting name="capabilities" type="as">["chat", "file", "smileys"]</setting>
+    </group>
+    <setting name="enabled" type="b">true</setting>
+  </template>
+
+</service>
 
=== added file 'tests/data/accounts/services/MyService2.service'
--- tests/data/accounts/services/MyService2.service	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/services/MyService2.service	2016-02-19 10:06:27 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="MyService2">
+  <type>calendar</type>
+  <name>My Service #2</name>
+  <icon>general_myservice2</icon>
+  <provider>maemo</provider>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="parameters">
+      <setting name="server">youtube.com</setting>
+    </group>
+  </template>
+
+</service>
 
=== added file 'tests/data/accounts/services/OtherService.service'
--- tests/data/accounts/services/OtherService.service	1970-01-01 00:00:00 +0000
+++ tests/data/accounts/services/OtherService.service	2016-02-19 10:06:27 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="OtherService">
+  <type>sharing</type>
+  <name>Other Service</name>
+  <icon>general_otherservice</icon>
+  <provider>other_provider</provider>
+  <tags>
+      <tag>video</tag>
+      <tag>sharing</tag>
+  </tags>
+  
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="parameters">
+      <setting name="server">talk.google.com</setting>
+      <setting name="port" type="i">5223</setting>
+      <setting name="old-ssl" type="b">true</setting>
+      <setting name="fallback-conference-server">conference.jabber.org</setting>
+    </group>
+  </template>
+
+</service>
 
=== added directory 'tests/data/applications'
=== added file 'tests/data/applications/Mailer.desktop'
--- tests/data/applications/Mailer.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/applications/Mailer.desktop	2016-02-19 10:06:27 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Easy Mailer
+Comment=Send and receive mail
+Exec=/bin/sh
+Icon=mailer-icon
+Terminal=false
+Type=Application
+Categories=Application;Network;Email;
 
=== removed file 'tests/e-mail.service-type'
--- tests/e-mail.service-type	2012-10-10 14:59:58 +0000
+++ tests/e-mail.service-type	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service-type id="e-mail">
-  <name>Electronic mail</name>
-  <description>Electronic mail description</description>
-  <icon>email_icon</icon>
-  <translations>translation_file</translations>
-  <tags>
-      <tag>e-mail</tag>
-      <tag>messaging</tag>
-  </tags>
-</service-type>
 
=== removed file 'tests/maemo.provider'
--- tests/maemo.provider	2013-01-23 13:09:21 +0000
+++ tests/maemo.provider	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<provider id="maemo">
-  <name>Example provider</name>
-  <description>An example provider</description>
-  <icon>example</icon>
-  <domains>.*example\.com</domains>
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <setting name="auth/method">dummy-method</setting>
-    <setting name="auth/mechanism">dummy-mechanism</setting>
-    <group name="auth/dummy-method/dummy-mechanism">
-      <setting name="id">879</setting>
-      <setting name="display">desktop</setting>
-      <setting name="from-provider">yes</setting>
-    </group>
-  </template>
-</provider>
 
=== modified file 'tests/xml-dtd-validate.sh'
--- tests/xml-dtd-validate.sh	2012-10-17 14:14:08 +0000
+++ tests/xml-dtd-validate.sh	2016-02-19 10:06:27 +0000
@@ -7,16 +7,16 @@
 
 for application in $applications
 do
-	${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-application.dtd ${TESTDATADIR}$application || exit 1
+	${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-application.dtd ${TESTDATADIR}/accounts/applications/$application || exit 1
 done
 
-${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-provider.dtd ${TESTDATADIR}MyProvider.provider
+${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-provider.dtd ${TESTDATADIR}/accounts/providers/MyProvider.provider
 
 services="MyService.service MyService2.service OtherService.service"
 
 for service in $services
 do
-	${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service.dtd ${TESTDATADIR}$service || exit 1
+	${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service.dtd ${TESTDATADIR}/accounts/services/$service || exit 1
 done
 
-${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service-type.dtd ${TESTDATADIR}e-mail.service-type
+${XMLLINT} $XMLLINT_ARGS ${DTDDIR}accounts-service-type.dtd ${TESTDATADIR}/accounts/service-types/e-mail.service-type