Merge lp:~dpm/ubuntu-rssreader-app/fixes-1282500 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

Proposed by David Planella
Status: Merged
Approved by: David Planella
Approved revision: 178
Merged at revision: 178
Proposed branch: lp:~dpm/ubuntu-rssreader-app/fixes-1282500
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 37 lines (+4/-3)
1 file modified
CMakeLists.txt (+4/-3)
To merge this branch: bzr merge lp:~dpm/ubuntu-rssreader-app/fixes-1282500
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) user testing Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+207401@code.launchpad.net

Commit message

Fixes bug 1282500 whereby when building click packages the icon file is missing.

Description of the change

Fixes bug 1282500 whereby when building click packages the icon file is missing.

To test it's working:

1. Check out this branch and cd into it
2. click-buddy --dir .
3. Examine the click package to ensure it contains the icon
4. Install the click package to ensure it works

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Same issue, the bzr changelog doesn't show the new icon. Please push the new icon.

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

The click package installs properly and I can see the new rss-reader icon :)

review: Approve (user testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-18 21:22:34 +0000
3+++ CMakeLists.txt 2014-02-20 10:41:29 +0000
4@@ -12,7 +12,7 @@
5 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE shorts-app)
7 set(MAIN_QML shorts-app.qml)
8-set(ICON rssreader-app@30.png)
9+set(ICON_FILE rssreader-app@30.png)
10 set(AUTOPILOT_DIR shorts_app)
11
12 if(CLICK_MODE)
13@@ -23,13 +23,14 @@
14 set(CMAKE_INSTALL_PREFIX /)
15 set(CMAKE_INSTALL_BINDIR /)
16 set(DATA_DIR /)
17+ set(ICON ${ICON_FILE})
18 set(EXEC "qmlscene ${MAIN_QML}")
19 set(DESKTOP_DIR ${DATA_DIR})
20 set(URLS_DIR ${DATA_DIR})
21 else(CLICK_MODE)
22 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
23 set(EXEC ${APP_HARDCODE})
24- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
25+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
26 configure_file(${APP_HARDCODE}.in
27 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
28 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
29@@ -53,7 +54,7 @@
30 GridModePage.qml GoogleFeedApi.qml OptionsKeeper.qml
31 dateutils.js imgSeparator.js databasemodule_v2.js
32 DESTINATION ${DATA_DIR})
33-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
34+install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
35
36 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
37 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}

Subscribers

People subscribed via source and target branches