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

[Alberto Mardegan]

Merge from upstream

Add Manager::serviceList() by app.

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

151. By Alberto Mardegan on 2016-09-29

Remove dependency on Qt4 packages

=== added file '.gitlab-ci.yml'
--- .gitlab-ci.yml	1970-01-01 00:00:00 +0000
+++ .gitlab-ci.yml	2016-09-29 09:02:36 +0000
@@ -0,0 +1,32 @@
+image: ubuntu:xenial
+
+cache:
+  key: apt-cache
+  paths:
+  - apt-cache/
+
+before_script:
+  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qtbase5-dev qtchooser pkg-config doxygen libaccounts-glib-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
+
+build_amd64:
+  stage: build
+  script:
+    - export QT_SELECT=qt5
+    - mkdir build
+    - cd build
+    - qmake CONFIG+=debug CONFIG+=coverage ..
+    - make -j 4
+  artifacts:
+    paths:
+      - build/
+
+test_amd64:
+  stage: test
+  script:
+    - find build | xargs touch # Avoid rebuilding
+    - cd build
+    - make coverage-html
+  dependencies:
+    - build_amd64
 
=== modified file 'Accounts/account-service.cpp'
--- Accounts/account-service.cpp	2015-10-27 12:31:06 +0000
+++ Accounts/account-service.cpp	2016-09-29 09:02:36 +0000
@@ -3,9 +3,9 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
 
=== modified file 'Accounts/account-service.h'
--- Accounts/account-service.h	2013-06-17 10:19:48 +0000
+++ Accounts/account-service.h	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
 * This file is part of libaccounts-qt
 *
-* Copyright (C) 2012 Canonical Ltd.
+* Copyright (C) 2012-2016 Canonical Ltd.
 *
 * Contact: Alberto Mardegan <[e-mail]>
 *
 
=== modified file 'Accounts/account.cpp'
--- Accounts/account.cpp	2015-10-27 12:31:06 +0000
+++ Accounts/account.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/account.h'
--- Accounts/account.h	2015-09-30 08:17:50 +0000
+++ Accounts/account.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/accountscommon.h'
--- Accounts/accountscommon.h	2015-10-27 12:31:06 +0000
+++ Accounts/accountscommon.h	2016-09-29 09:02:36 +0000
@@ -3,8 +3,9 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
 
=== modified file 'Accounts/application.cpp'
--- Accounts/application.cpp	2014-02-11 10:33:32 +0000
+++ Accounts/application.cpp	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of libaccounts-qt
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -180,6 +180,17 @@
 }
 
 /*!
+ * Check whether the application supports the given service.
+ * @param service Instance of a Service.
+ * @return whether the service is supported by this application.
+ */
+bool Application::supportsService(const Service &service) const
+{
+    return ag_application_supports_service(m_application,
+                                           service.service());
+}
+
+/*!
  * Get the description from the application XML file, for the specified
  * service; if not found, get the service-type description instead.
  * @return Usage description of the service.
@@ -189,3 +200,8 @@
     return UTF8(ag_application_get_service_usage(m_application,
                                                  service.service()));
 }
+
+AgApplication *Application::application() const
+{
+    return m_application;
+}
 
=== modified file 'Accounts/application.h'
--- Accounts/application.h	2014-02-11 10:33:32 +0000
+++ Accounts/application.h	2016-09-29 09:02:36 +0000
@@ -1,25 +1,26 @@
 /* vi: set et sw=4 ts=4 cino=t0,(0: */
 /*
-* This file is part of libaccounts-qt
-*
-* Copyright (C) 2012 Nokia Corporation.
-*
-* Contact: Alberto Mardegan <[e-mail]>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation.
-*
-* This library is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
-*/
+ * This file is part of libaccounts-qt
+ *
+ * Copyright (C) 2012 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 
 #ifndef ACCOUNTS_APPLICATION_H
 #define ACCOUNTS_APPLICATION_H
@@ -54,12 +55,14 @@
     QString desktopFilePath() const;
     QString trCatalog() const;
 
+    bool supportsService(const Service &service) const;
     QString serviceUsage(const Service &service) const;
 
 private:
     // Don't include private data in docs: \cond
     friend class Manager;
     Application(AgApplication *application);
+    AgApplication *application() const;
 
     AgApplication *m_application;
     // \endcond
 
=== modified file 'Accounts/auth-data.cpp'
--- Accounts/auth-data.cpp	2014-09-05 13:23:44 +0000
+++ Accounts/auth-data.cpp	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of libaccounts-qt
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/auth-data.h'
--- Accounts/auth-data.h	2012-03-13 10:54:48 +0000
+++ Accounts/auth-data.h	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of libaccounts-qt
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/error.cpp'
--- Accounts/error.cpp	2012-03-13 09:50:49 +0000
+++ Accounts/error.cpp	2016-09-29 09:02:36 +0000
@@ -2,8 +2,9 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
 
=== modified file 'Accounts/error.h'
--- Accounts/error.h	2013-01-21 09:43:43 +0000
+++ Accounts/error.h	2016-09-29 09:02:36 +0000
@@ -2,8 +2,9 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
 
=== modified file 'Accounts/manager.cpp'
--- Accounts/manager.cpp	2015-08-14 07:18:58 +0000
+++ Accounts/manager.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -384,6 +384,35 @@
 }
 
 /*!
+ * Get the list of services supported by the given application.
+ *
+ * @param application Application whose services are to be retrieved.
+ *
+ * @return List of Service objects.
+ */
+ServiceList Manager::serviceList(const Application &application) const
+{
+    GList *list;
+
+    list = ag_manager_list_services_by_application(d->m_manager,
+                                                   application.application());
+
+    /* convert glist -> ServiceList */
+    ServiceList servList;
+    GList *iter;
+
+    for (iter = list; iter; iter = g_list_next(iter))
+    {
+        AgService *service = (AgService*)iter->data;
+        servList.append(Service(service, StealReference));
+    }
+
+    g_list_free(list);
+
+    return servList;
+}
+
+/*!
  * Gets an object representing a provider.
  * @param providerName Name of provider to get.
  *
 
=== modified file 'Accounts/manager.h'
--- Accounts/manager.h	2014-08-14 14:50:11 +0000
+++ Accounts/manager.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -76,6 +76,7 @@
 
     Service service(const QString &serviceName) const;
     ServiceList serviceList(const QString &serviceType = QString::null) const;
+    ServiceList serviceList(const Application &application) const;
 
     Provider provider(const QString &providerName) const;
     ProviderList providerList() const;
 
=== modified file 'Accounts/manager_p.h'
--- Accounts/manager_p.h	2013-04-26 06:31:51 +0000
+++ Accounts/manager_p.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/provider.cpp'
--- Accounts/provider.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/provider.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012-2014 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/provider.h'
--- Accounts/provider.h	2014-03-05 15:56:31 +0000
+++ Accounts/provider.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012-2014 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/service-type.cpp'
--- Accounts/service-type.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/service-type.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
 
=== modified file 'Accounts/service-type.h'
--- Accounts/service-type.h	2012-05-21 12:35:18 +0000
+++ Accounts/service-type.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
 
=== modified file 'Accounts/service.cpp'
--- Accounts/service.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/service.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
 
=== modified file 'Accounts/service.h'
--- Accounts/service.h	2012-05-21 12:35:18 +0000
+++ Accounts/service.h	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
 
=== modified file 'Accounts/utils.cpp'
--- Accounts/utils.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/utils.cpp	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of libaccounts-qt
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'Accounts/utils.h'
--- Accounts/utils.h	2013-01-18 11:55:30 +0000
+++ Accounts/utils.h	2016-09-29 09:02:36 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of libaccounts-qt
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
 
=== modified file 'common-vars.pri'
--- common-vars.pri	2015-09-30 08:58:04 +0000
+++ common-vars.pri	2016-09-29 09:02:36 +0000
@@ -13,12 +13,12 @@
 #-----------------------------------------------------------------------------
 # Project version
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 1.14
+PROJECT_VERSION = 1.15
 
 #-----------------------------------------------------------------------------
 # Library version
 #-----------------------------------------------------------------------------
-VERSION = 1.2
+VERSION = 1.3
 
 
 # End of File
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-11-06 13:54:55 +0000
+++ debian/changelog	2016-09-29 09:02:36 +0000
@@ -1,3 +1,15 @@
+libaccounts-qt (1.15-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Lib: add Manager::listServices() by application
+      and Application::supportsService()
+    - Enable CI in gitlab
+    - Build: fix out of tree builds
+  * debian/control:
+    - Remove dependency on Qt4 packages
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 29 Sep 2016 11:53:39 +0300
+
 libaccounts-qt (1.14+16.04.20151106.1-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'debian/control'
--- debian/control	2015-11-02 09:11:27 +0000
+++ debian/control	2016-09-29 09:02:36 +0000
@@ -5,13 +5,10 @@
                doxygen,
                pkg-config,
                libglib2.0-dev,
-               libqt4-dev,
-               qt4-dev-tools,
                qtchooser,
-               qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
-               libaccounts-glib-dev (>= 1.17),
+               libaccounts-glib-dev (>= 1.23),
                dbus-test-runner,
 Standards-Version: 3.9.3
 Section: libs
 
=== modified file 'tests/tst_libaccounts.cpp'
--- tests/tst_libaccounts.cpp	2015-10-01 14:53:36 +0000
+++ tests/tst_libaccounts.cpp	2016-09-29 09:02:36 +0000
@@ -3,7 +3,7 @@
  * This file is part of libaccounts-qt
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -99,6 +99,7 @@
     void testServiceType();
     void testUpdateAccount();
     void testApplication();
+    void testApplicationListServices();
 
 public Q_SLOTS:
     void onAccountServiceChanged();
@@ -1418,6 +1419,7 @@
     QCOMPARE(application.iconName(), UTF8("mailer-icon"));
     QCOMPARE(application.desktopFilePath(),
              UTF8(qgetenv("AG_APPLICATIONS") + "/applications/mailer.desktop"));
+    QVERIFY(application.supportsService(email));
     QCOMPARE(application.serviceUsage(email),
              UTF8("Mailer can retrieve your e-mails"));
 
@@ -1430,6 +1432,7 @@
     application = apps[0];
     QCOMPARE(application.name(), UTF8("Gallery"));
     QCOMPARE(application.description(), UTF8("Image gallery"));
+    QVERIFY(application.supportsService(sharing));
     QCOMPARE(application.serviceUsage(sharing),
              UTF8("Publish images on OtherService"));
 
@@ -1442,5 +1445,23 @@
     delete manager;
 }
 
+void AccountsTest::testApplicationListServices()
+{
+    Manager *manager = new Manager();
+    QVERIFY(manager != 0);
+
+    Application application = manager->application("Mailer");
+    QVERIFY(application.isValid());
+
+    ServiceList services = manager->serviceList(application);
+
+    QCOMPARE(services.count(), 1);
+    Service service = services.first();
+
+    QCOMPARE(service.name(), QString("MyService"));
+
+    delete manager;
+}
+
 QTEST_GUILESS_MAIN(AccountsTest)
 #include "tst_libaccounts.moc"