Merge lp:~artmello/gallery-app/gallery-app-new_icon into lp:gallery-app

[Arthur Mello]

update icon

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1200
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~artmello/gallery-app/gallery-app-new_icon/+merge/262979/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/87
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/633
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21479

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

review: Needs Fixing (continuous-integration)

=== modified file 'desktop/CMakeLists.txt'
--- desktop/CMakeLists.txt	2014-09-23 12:56:44 +0000
+++ desktop/CMakeLists.txt	2015-06-25 14:06:41 +0000
@@ -1,7 +1,7 @@
 if(CLICK_MODE)
-    install(FILES gallery-app.svg DESTINATION
+    install(FILES gallery-app.png DESTINATION
         ${CMAKE_INSTALL_DATADIR}/icons)
-	set(ICON "${CMAKE_INSTALL_DATADIR}/icons/${GALLERY}.svg")
+	set(ICON "${CMAKE_INSTALL_DATADIR}/icons/${GALLERY}.png")
 	set(APP_EXEC "./${GALLERY}")
 else(CLICK_MODE)
     install(DIRECTORY icons/hicolor DESTINATION DESTINATION

=== added file 'desktop/gallery-app.png'
Binary files desktop/gallery-app.png	1970-01-01 00:00:00 +0000 and desktop/gallery-app.png	2015-06-25 14:06:41 +0000 differ
=== modified file 'desktop/icons/hicolor/256x256/apps/gallery-app.png'
Binary files desktop/icons/hicolor/256x256/apps/gallery-app.png	2013-06-11 20:18:27 +0000 and desktop/icons/hicolor/256x256/apps/gallery-app.png	2015-06-25 14:06:41 +0000 differ