gallery-app

Merge lp:~ken-vandine/gallery-app/click_content_hub_source into lp:~bfiller/gallery-app/click-support

  1. click_content_hub_source
  2. Merge into click-support
Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 909
Merged at revision: 909
Proposed branch: lp:~ken-vandine/gallery-app/click_content_hub_source
Merge into: lp:~bfiller/gallery-app/click-support
Diff against target: 33 lines (+7/-1)
3 files modified
click/CMakeLists.txt (+1/-1)
click/gallery-content.json (+5/-0)
click/manifest.json.in (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/gallery-app/click_content_hub_source
Reviewer Review Type Date Requested Status
Bill Filler Approve
Review via email: mp+203764@code.launchpad.net

Commit message

Install as a source for content-hub

Description of the change

Install as a source for content-hub

To post a comment you must log in.
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/CMakeLists.txt'
2--- click/CMakeLists.txt 2013-10-06 23:41:40 +0000
3+++ click/CMakeLists.txt 2014-01-29 14:43:12 +0000
4@@ -5,6 +5,6 @@
5 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
7 DESTINATION ${CMAKE_INSTALL_PREFIX})
8- install(FILES gallery-apparmor.json
9+ install(FILES gallery-apparmor.json gallery-content.json
10 DESTINATION ${CMAKE_INSTALL_PREFIX})
11 endif(CLICK_MODE)
12
13=== added file 'click/gallery-content.json'
14--- click/gallery-content.json 1970-01-01 00:00:00 +0000
15+++ click/gallery-content.json 2014-01-29 14:43:12 +0000
16@@ -0,0 +1,5 @@
17+{
18+ "source": [
19+ "pictures"
20+ ]
21+}
22
23=== modified file 'click/manifest.json.in'
24--- click/manifest.json.in 2014-01-10 23:27:14 +0000
25+++ click/manifest.json.in 2014-01-29 14:43:12 +0000
26@@ -6,6 +6,7 @@
27 "hooks": {
28 "gallery": {
29 "apparmor": "gallery-apparmor.json",
30+ "content-hub": "gallery-content.json",
31 "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
32 }
33 },

Subscribers

People subscribed via source and target branches

to all changes: