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

[Victor Thompson]

* Fix the CMakeLists.txt to include the app icon

* Fix the CMakeLists.txt to include the app icon

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

The icon is back! LGTM :-)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/80/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/71/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/80/console

review: Needs Fixing (continuous-integration)

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

81. By Victor Thompson on 2015-08-07

Merge trunk/reboot and resolve conflicts

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-01 12:22:16 +0000
+++ CMakeLists.txt	2015-08-07 00:12:27 +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_FILE [e-mail])
+set(ICON [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
 
 # Set install paths
 
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-07-01 12:38:05 +0000
+++ app/CMakeLists.txt	2015-08-07 00:12:27 +0000
@@ -4,7 +4,6 @@
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 
-set(ICON ${ICON_FILE})
 install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-06 01:34:38 +0000
+++ debian/changelog	2015-08-07 00:12:27 +0000
@@ -1,4 +1,4 @@
-ubuntu-weather-app (3.0) UNRELEASED; urgency=medium
+ubuntu-weather-app (3.0ubuntu1) UNRELEASED; urgency=medium
 
   [ Victor Thompson ]
   * Sync debian version with click version.
@@ -8,6 +8,7 @@
   * Add conditions text to day delegate. 
   * Default to OWM if the key file for TWC is blank.
   * Add sunrise and sunset icons from the spec
+  * Fix the CMakeLists.txt to include the app icon
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data