Merge lp:~renatofilho/messaging-app/fix-1269017 into lp:messaging-app

[Renato Araujo Oliveira Filho]

Added Symbola font as dependency

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5908
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5908/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3747/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/451/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/messaging-app/fix-1269017]

228. By Renato Araujo Oliveira Filho on 2014-09-10

Removed Symbola font.

229. By Renato Araujo Oliveira Filho on 2014-09-10

Added ttf-ancient-fonts-symbola as dependecy.

The ttf-ancient-fonts-symbola is necessary to render emojis.

[Marco Trevisan (Treviño) (3v1n0)]

About the license, the website source of these fonts states:

«Fonts in this site are offered free for any use; they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. George Douros»

So... It seems fair.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/454/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4693/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3462/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/248
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4467/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5945
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5945/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13024
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2864/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3767/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/454/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/messaging-app/fix-1269017]

230. By Renato Araujo Oliveira Filho on 2014-09-10

Replace tab to spaces.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/459/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4708
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3470/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/253
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5960
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5960/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13039
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2871/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3775
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3775/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/459/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-08-19 15:24:14 +0000
+++ debian/control	2014-09-10 20:02:26 +0000
@@ -36,6 +36,7 @@
          qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
          qtdeclarative5-qtcontacts-plugin,
          qml-module-qt-labs-settings,
+         ttf-ancient-fonts-symbola,
 Recommends: unity8 (>= 7.81.0~),
 Description: messaging application for Ubuntu
  An application to send and receive messages.

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2014-09-04 03:08:20 +0000
+++ src/qml/MainPage.qml	2014-09-10 20:02:26 +0000
@@ -112,7 +112,7 @@
         }
     ]
 
-    Item { 
+    Item {
         id: emptyStateScreen
         anchors.left: parent.left
         anchors.leftMargin: units.gu(6)