Merge lp:~vthompson/ubuntu-weather-app/reboot-icon-fix into lp:ubuntu-weather-app

[Victor Thompson]

Add icon file into debian package

Add icon file into debian package

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/135/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/105/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/135/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/135/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-icon-fix]

62. By Victor Thompson on 2015-07-01

Bump rev

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:62
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/136/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/136

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/136/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Looks good to me. Thanks

review: Approve

[Victor Thompson (vthompson)]

I have my PPA running against this branch and I don't think it's working
yet, unfortunately.
On Jul 1, 2015 9:29 AM, "Bartosz Kosiorek" <email address hidden> wrote:

> Review: Approve
>
> Looks good to me. Thanks
> --
>
> https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-icon-fix/+merge/263513
> You are the owner of lp:~vthompson/ubuntu-weather-app/reboot-icon-fix.
>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-22 00:13:54 +0000
+++ CMakeLists.txt	2015-07-01 12:38:21 +0000
@@ -33,7 +33,7 @@
 set(APP_HARDCODE ubuntu-weather-app)
 set(MAIN_QML ${APP_HARDCODE}.qml)
 set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
-set(ICON [e-mail])
+set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
 
 # Set install paths
 
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-02-08 20:56:21 +0000
+++ app/CMakeLists.txt	2015-07-01 12:38:21 +0000
@@ -4,10 +4,8 @@
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 
-if(CLICK_MODE)
-  set(ICON ${ICON})
-  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif(CLICK_MODE)
+set(ICON ${ICON_FILE})
+install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})