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

Proposed by Renato Araujo Oliveira Filho on 2014-09-09
Status: Merged
Approved by: Bill Filler on 2014-09-17
Approved revision: 230
Merged at revision: 243
Proposed branch: lp:~renatofilho/messaging-app/fix-1269017
Merge into: lp:messaging-app
Diff against target: 24 lines (+2/-1)
2 files modified
debian/control (+1/-0)
src/qml/MainPage.qml (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/messaging-app/fix-1269017
Reviewer Review Type Date Requested Status
Bill Filler (community) 2014-09-09 Approve on 2014-09-17
PS Jenkins bot continuous-integration Needs Fixing on 2014-09-10
Review via email: mp+233986@code.launchpad.net

Commit message

Added Symbola font as dependency

To post a comment you must log in.
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) wrote :

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.

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

Replace tab to spaces.

Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-08-19 15:24:14 +0000
3+++ debian/control 2014-09-10 20:02:26 +0000
4@@ -36,6 +36,7 @@
5 qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
6 qtdeclarative5-qtcontacts-plugin,
7 qml-module-qt-labs-settings,
8+ ttf-ancient-fonts-symbola,
9 Recommends: unity8 (>= 7.81.0~),
10 Description: messaging application for Ubuntu
11 An application to send and receive messages.
12
13=== modified file 'src/qml/MainPage.qml'
14--- src/qml/MainPage.qml 2014-09-04 03:08:20 +0000
15+++ src/qml/MainPage.qml 2014-09-10 20:02:26 +0000
16@@ -112,7 +112,7 @@
17 }
18 ]
19
20- Item {
21+ Item {
22 id: emptyStateScreen
23 anchors.left: parent.left
24 anchors.leftMargin: units.gu(6)

Subscribers

People subscribed via source and target branches