ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

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

Commit message:
Add icon file into debian package

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)
Related bugs:
  Bug #1466518 in Ubuntu Weather App: "Icon not shipped in the .deb package"
  https://bugs.launchpad.net/ubuntu-weather-app/+bug/1466518

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

Add icon file into debian package
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/reboot-icon-fix into lp:ubuntu-weather-app/reboot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-22 00:13:54 +0000
+++ CMakeLists.txt	2015-07-01 12:24:02 +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 weather-app@xxxxxx)
+set(ICON_FILE weather-app@xxxxxx)
 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:24:02 +0000
@@ -5,9 +5,12 @@
 
 
 if(CLICK_MODE)
-  set(ICON ${ICON})
+  set(ICON ${ICON_FILE})
   install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif(CLICK_MODE)
+  set(ICON ${ICON_FILE})
+  install(FILES ${ICON} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
+else(CLICK_MODE)
 
 install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})