Merge lp:~pete-woods/camera-app/file-based-infographics into lp:camera-app

Proposed by Pete Woods on 2014-03-12
Status: Needs review
Proposed branch: lp:~pete-woods/camera-app/file-based-infographics
Merge into: lp:camera-app
Prerequisite: lp:~pete-woods/camera-app/handle-quit-signal
Diff against target: 80 lines (+11/-4)
5 files modified
CMakeLists.txt (+6/-0)
camera-apparmor.json (+0/-1)
debian/camera-app.install (+1/-0)
debian/control (+1/-1)
manifest.json (+3/-2)
To merge this branch: bzr merge lp:~pete-woods/camera-app/file-based-infographics
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-08-27
Ubuntu Phablet Team 2014-03-12 Pending
Review via email: mp+210573@code.launchpad.net

Commit message

Enable the infographic source hook for file based infographics

Description of the change

Enable the infographic source hook for file based infographics

To post a comment you must log in.
Florian Boucault (fboucault) wrote :

Who reviewed this?

MichaƂ Sawicz (saviq) wrote :

As you can see, no one. But please do, we want to land the new style infographics finally.

Unmerged revisions

344. By Pete Woods on 2014-07-29

Add support for file based infographics

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-07-31 18:41:17 +0000
3+++ CMakeLists.txt 2014-08-06 11:39:49 +0000
4@@ -43,6 +43,11 @@
5 set(CAMERA_ICON "camera-app")
6 set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
7 set(DESKTOP_EXEC ${CAMERA_APP})
8+ install(
9+ FILES "camera-usermetrics.json"
10+ DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
11+ RENAME "com.ubuntu.camera.json"
12+ )
13 endif(CLICK_MODE)
14
15 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
16@@ -119,6 +124,7 @@
17 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
18 DESTINATION ${CMAKE_INSTALL_PREFIX})
19 install(FILES camera-apparmor.json
20+ camera-usermetrics.json
21 DESTINATION ${CMAKE_INSTALL_PREFIX})
22 install(FILES camera-contenthub.json
23 DESTINATION ${CMAKE_INSTALL_PREFIX})
24
25=== modified file 'camera-apparmor.json'
26--- camera-apparmor.json 2014-07-31 18:41:17 +0000
27+++ camera-apparmor.json 2014-08-06 11:39:49 +0000
28@@ -5,7 +5,6 @@
29 "camera",
30 "audio",
31 "video",
32- "usermetrics",
33 "content_exchange",
34 "content_exchange_source",
35 "location"
36
37=== added file 'camera-usermetrics.json'
38=== modified file 'debian/camera-app.install'
39--- debian/camera-app.install 2014-07-29 16:44:02 +0000
40+++ debian/camera-app.install 2014-08-06 11:39:49 +0000
41@@ -5,4 +5,5 @@
42 usr/share/camera-app/*.js
43 usr/share/camera-app/assets/*
44 usr/share/icons
45+usr/share/libusermetrics
46 usr/share/locale/*/LC_MESSAGES/camera-app.mo
47
48=== modified file 'debian/control'
49--- debian/control 2014-07-16 14:24:12 +0000
50+++ debian/control 2014-08-06 11:39:49 +0000
51@@ -18,7 +18,7 @@
52 qtdeclarative5-usermetrics0.1,
53 qtdeclarative5-ubuntu-content0.1,
54 qtmultimedia5-dev,
55- libusermetricsinput1-dev,
56+ libusermetricsinput1-dev (>= 1.2.0),
57 gettext,
58 dh-translations,
59 Standards-Version: 3.9.5
60
61=== modified file 'manifest.json'
62--- manifest.json 2014-07-31 18:41:17 +0000
63+++ manifest.json 2014-08-06 11:39:49 +0000
64@@ -6,7 +6,8 @@
65 "camera": {
66 "apparmor": "camera-apparmor.json",
67 "desktop": "@DESKTOP_FILE@",
68- "content-hub": "camera-contenthub.json"
69+ "content-hub": "camera-contenthub.json",
70+ "usermetrics": "camera-usermetrics.json"
71 }
72 },
73 "icon": "@CAMERA_ICON@",
74@@ -21,4 +22,4 @@
75 "x-test": {
76 "autopilot": "@AUTOPILOT_DIR@"
77 }
78-}
79\ No newline at end of file
80+}

Subscribers

People subscribed via source and target branches