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

Proposed by Victor Thompson on 2015-08-04
Status: Merged
Approved by: Victor Thompson on 2015-08-07
Approved revision: 81
Merged at revision: 82
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1478183
Merge into: lp:ubuntu-weather-app
Diff against target: 42 lines (+3/-3)
3 files modified
CMakeLists.txt (+1/-1)
app/CMakeLists.txt (+0/-1)
debian/changelog (+2/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1478183
Reviewer Review Type Date Requested Status
Victor Thompson Approve on 2015-08-07
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-07
Andrew Hayzen 2015-08-04 Approve on 2015-08-06
Review via email: mp+266823@code.launchpad.net

Commit message

* Fix the CMakeLists.txt to include the app icon

Description of the change

* Fix the CMakeLists.txt to include the app icon

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

The icon is back! LGTM :-)

review: Approve
81. By Victor Thompson on 2015-08-07

Merge trunk/reboot and resolve conflicts

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
33set(APP_HARDCODE ubuntu-weather-app)33set(APP_HARDCODE ubuntu-weather-app)
34set(MAIN_QML ${APP_HARDCODE}.qml)34set(MAIN_QML ${APP_HARDCODE}.qml)
35set(DESKTOP_FILE "${APP_HARDCODE}.desktop")35set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
36set(ICON_FILE weather-app@30.png)36set(ICON weather-app@30.png)
37set(AUTOPILOT_DIR ubuntu_weather_app)37set(AUTOPILOT_DIR ubuntu_weather_app)
3838
39# Set install paths39# Set install paths
4040
=== 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 @@
4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
55
66
7set(ICON ${ICON_FILE})
8install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})7install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
98
10install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})9install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
1110
=== 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 @@
1ubuntu-weather-app (3.0) UNRELEASED; urgency=medium1ubuntu-weather-app (3.0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Victor Thompson ]3 [ Victor Thompson ]
4 * Sync debian version with click version.4 * Sync debian version with click version.
@@ -8,6 +8,7 @@
8 * Add conditions text to day delegate. 8 * Add conditions text to day delegate.
9 * Default to OWM if the key file for TWC is blank.9 * Default to OWM if the key file for TWC is blank.
10 * Add sunrise and sunset icons from the spec10 * Add sunrise and sunset icons from the spec
11 * Fix the CMakeLists.txt to include the app icon
1112
12 [ Andrew Hayzen ]13 [ Andrew Hayzen ]
13 * Add mocked locations for autopilot and add a test using the data14 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: