ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/fix-1478183 into lp:ubuntu-weather-app/reboot.

Commit message:
* Fix the CMakeLists.txt to include the app icon

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)
Related bugs:
  Bug #1478183 in Ubuntu Weather App: "Building reboot sometimes results in the Icon in the .desktop file on the device to be blank"
  https://bugs.launchpad.net/ubuntu-weather-app/+bug/1478183

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/fix-1478183/+merge/266823

* Fix the CMakeLists.txt to include the app icon
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/fix-1478183 into lp:ubuntu-weather-app/reboot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-01 12:22:16 +0000
+++ CMakeLists.txt	2015-08-04 03:03:26 +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 weather-app@xxxxxx)
+set(ICON weather-app@xxxxxx)
 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-04 03:03:26 +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-07-30 02:55:02 +0000
+++ debian/changelog	2015-08-04 03:03:26 +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
@@ -20,7 +21,7 @@
   * Change phrasing of manual add location
   * Conditionally show "searching for current location" depending on the detectCurrentLocation setting
 
- -- Victor Thompson <victor.thompson@xxxxxxxxx>  Mon, 01 Jun 2015 20:11:23 -0500
+ -- Victor Thompson <victor.thompson@xxxxxxxxx>  Mon, 03 Aug 2015 22:00:12 -0500
 
 ubuntu-weather-app (2.1) UNRELEASED; urgency=medium