Merge lp:~ken-vandine/ubuntu-filemanager-app/deb_content-hub_peer_registration into lp:ubuntu-filemanager-app

Proposed by Ken VanDine on 2016-09-29
Status: Needs review
Proposed branch: lp:~ken-vandine/ubuntu-filemanager-app/deb_content-hub_peer_registration
Merge into: lp:ubuntu-filemanager-app
Diff against target: 11 lines (+1/-0)
1 file modified
CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-filemanager-app/deb_content-hub_peer_registration
Reviewer Review Type Date Requested Status
Carlos Jose Mazieri 2016-09-29 Approve on 2016-10-13
Jenkins Bot continuous-integration Approve on 2016-09-30
Review via email: mp+307223@code.launchpad.net

Commit message

content-hub peer registration for deb package installs

Description of the change

content-hub peer registration for deb package installs

To post a comment you must log in.
575. By Ken VanDine on 2016-09-29

Simplified install

review: Approve (continuous-integration)
review: Approve (continuous-integration)
576. By Ken VanDine on 2016-09-30

make sure the appId matches the desktop file name

review: Approve (continuous-integration)

I am OK with this. Thanks.

review: Approve

Unmerged revisions

576. By Ken VanDine on 2016-09-30

make sure the appId matches the desktop file name

575. By Ken VanDine on 2016-09-29

Simplified install

574. By Ken VanDine on 2016-09-29

content-hub peer registration for deb package installs

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 2016-07-14 15:04:49 +0000
3+++ CMakeLists.txt 2016-09-30 17:55:26 +0000
4@@ -117,6 +117,7 @@
5 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
6 set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
7 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
8+ install(FILES ${CONTENT_HUB_JSON} DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers/ RENAME com.ubuntu.filemanager)
9 endif(CLICK_MODE)
10
11 file(GLOB_RECURSE I18N_SRC_FILES

Subscribers

People subscribed via source and target branches