Merge lp:~unity-api-team/telephony-service/file-based-infographics into lp:telephony-service

[Pete Woods]

Support the new libusermetrics hook

Support the new libusermetrics hook

Depends on lp:~unity-team/libusermetrics/file-based-infographics being merged

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:833
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/telephony-service/file-based-infographics]

834. By Pete Woods on 2014-06-23

Work around breakage resulting from Qt5.3

See: https://qt.gitorious.org/qt/digia-qt/commit/e1ac82f713ab2a766ae518f3ec7a7f76689acb48

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:834
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/218/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/telephony-service/file-based-infographics]

835. By Pete Woods on 2014-06-25

Set the APP_ID

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:835
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/219/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Can you please remove the workarounds in greeter contacts' tests? Also, can you please merge the latest changes from trunk in this MR?

Thanks.

review: Needs Fixing

[lp:~unity-api-team/telephony-service/file-based-infographics]

836. By Pete Woods on 2014-07-07

Revert the workaround

837. By Pete Woods on 2014-07-07

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:837
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/242/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/242/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/telephony-service/file-based-infographics]

838. By Pete Woods on 2014-07-14

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:838
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/256/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/256/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/telephony-service/file-based-infographics]

839. By Pete Woods on 2014-08-06

Merge trunk

[Michał Sawicz (saviq)]

Text conflict in indicator/metrics.cpp
1 conflicts encountered.

[lp:~unity-api-team/telephony-service/file-based-infographics]

840. By Gustavo Pichorim Boiko on 2014-09-02

Merge latest changes from trunk.

Unmerged revisions

840. By Gustavo Pichorim Boiko on 2014-09-02

Merge latest changes from trunk.

839. By Pete Woods on 2014-08-06

Merge trunk

838. By Pete Woods on 2014-07-14

Merge trunk

837. By Pete Woods on 2014-07-07

Merge trunk

836. By Pete Woods on 2014-07-07

Revert the workaround

835. By Pete Woods on 2014-06-25

Set the APP_ID

834. By Pete Woods on 2014-06-23

Work around breakage resulting from Qt5.3

See: https://qt.gitorious.org/qt/digia-qt/commit/e1ac82f713ab2a766ae518f3ec7a7f76689acb48

833. By Pete Woods on 2014-06-23

Support the new libusermetrics hook

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-05 20:04:00 +0000
+++ CMakeLists.txt	2014-09-02 17:10:50 +0000
@@ -86,6 +86,13 @@
 add_definitions(-std=c++11)
 
 set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
+
+# install infographics source hook
+install(
+    FILES "${DATA_DIR}/telephony-service.json"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
+    )
+
 # install assets
 set(ASSETS_DIR assets)
 install(DIRECTORY ${ASSETS_DIR} DESTINATION ${TELEPHONY_SERVICE_DIR})

=== added file 'data/telephony-service.json'
=== modified file 'debian/control'
--- debian/control	2014-08-19 15:27:08 +0000
+++ debian/control	2014-09-02 17:10:50 +0000
@@ -30,7 +30,7 @@
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtmultimedia5-dev (>= 5.0),
                qtpim5-dev (>= 5),
-               libusermetricsinput1-dev,
+               libusermetricsinput1-dev (>= 1.2.0),
                telepathy-mission-control-5,
                xvfb,
 Standards-Version: 3.9.4

=== modified file 'debian/telephony-service.install'
--- debian/telephony-service.install	2014-03-24 18:53:27 +0000
+++ debian/telephony-service.install	2014-09-02 17:10:50 +0000
@@ -14,5 +14,6 @@
 usr/share/polkit-1/actions/*TelephonyService*.policy
 usr/share/telepathy/clients/TelephonyService*.client
 usr/share/telephony-service/assets/*
+usr/share/libusermetrics
 var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
 upstart/telephony-service-indicator.conf /usr/share/upstart/sessions

=== modified file 'indicator/metrics.cpp'
--- indicator/metrics.cpp	2014-08-20 09:35:55 +0000
+++ indicator/metrics.cpp	2014-09-02 17:10:50 +0000
@@ -38,7 +38,7 @@
     QObject(parent)
 {
     try {
-        mMetricManager.reset(MetricManager::getInstance());
+        mMetricManager.reset(MetricManager::getInstance(APP_ID));
         mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages sent today"))
                                                       .emptyDataString(GettextMarkExtraction("No text messages sent today")).textDomain(APP_ID).minimum(0.0));
         mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages received today"))