Merge lp:~boiko/messaging-app/ship_icon into lp:messaging-app

[Gustavo Pichorim Boiko]

Ship the messaging-app icon together with the package

Ship the messaging-app icon together with the package

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[Tiago Salem Herrmann (tiagosh)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Not yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'src/messaging-app.desktop.in.in'
--- src/messaging-app.desktop.in.in	2014-07-21 14:36:43 +0000
+++ src/messaging-app.desktop.in.in	2014-10-03 23:06:05 +0000
@@ -6,7 +6,7 @@
 _Keywords=Messages;SMS;MMS;Text Messages;Text
 Exec=messaging-app %u
 Terminal=false
-Icon=messaging-app
+Icon=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app.png
 MimeType=x-scheme-handler/contact;x-scheme-handler/call
 X-Ubuntu-Touch=true
 X-Ubuntu-Default-Department-ID=accessories

=== added file 'src/qml/assets/messaging-app.png'
Binary files src/qml/assets/messaging-app.png	1970-01-01 00:00:00 +0000 and src/qml/assets/messaging-app.png	2014-10-03 23:06:05 +0000 differ