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

[Ken VanDine]

content-hub peer registration for deb package installs

content-hub peer registration for deb package installs

[lp:~ken-vandine/ubuntu-filemanager-app/deb_content-hub_peer_registration]

575. By Ken VanDine on 2016-09-29

Simplified install

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:574
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/88/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/978/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/88/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:575
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/89/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/979/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/89/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/ubuntu-filemanager-app/deb_content-hub_peer_registration]

576. By Ken VanDine on 2016-09-30

make sure the appId matches the desktop file name

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:576
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/90/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/980/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/90/rebuild

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-14 15:04:49 +0000
+++ CMakeLists.txt	2016-09-30 17:55:26 +0000
@@ -117,6 +117,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES ${CONTENT_HUB_JSON} DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers/ RENAME com.ubuntu.filemanager)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES