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

Proposed by Victor Thompson on 2015-07-01
Status: Merged
Approved by: Bartosz Kosiorek on 2015-07-01
Approved revision: 62
Merged at revision: 61
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-icon-fix
Merge into: lp:ubuntu-weather-app
Diff against target: 28 lines (+3/-5)
2 files modified
CMakeLists.txt (+1/-1)
app/CMakeLists.txt (+2/-4)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-icon-fix
Reviewer Review Type Date Requested Status
Bartosz Kosiorek (community) 2015-07-01 Approve on 2015-07-01
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-07-01
Review via email: mp+263513@code.launchpad.net

Commit message

Add icon file into debian package

Description of the change

Add icon file into debian package

To post a comment you must log in.
62. By Victor Thompson on 2015-07-01

Bump rev

Bartosz Kosiorek (gang65) wrote :

Looks good to me. Thanks

review: Approve
Victor Thompson (vthompson) wrote :

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.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
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 weather-app@30.png)36set(ICON_FILE 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-02-08 20:56:21 +0000
+++ app/CMakeLists.txt 2015-07-01 12:38:21 +0000
@@ -4,10 +4,8 @@
4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
55
66
7if(CLICK_MODE)7set(ICON ${ICON_FILE})
8 set(ICON ${ICON})8install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
9 install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
10endif(CLICK_MODE)
119
12install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})10install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
1311

Subscribers

People subscribed via source and target branches

to all changes: