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
43
    set(CAMERA_ICON "camera-app")
43
    set(CAMERA_ICON "camera-app")
6
44
    set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
44
    set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
7
45
    set(DESKTOP_EXEC ${CAMERA_APP})
45
    set(DESKTOP_EXEC ${CAMERA_APP})
8
46
    install(
9
47
        FILES "camera-usermetrics.json"
10
48
        DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
11
49
        RENAME "com.ubuntu.camera.json"
12
50
    )
13
46
endif(CLICK_MODE)
51
endif(CLICK_MODE)
14
47
52
15
48
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
53
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
16
@@ -119,6 +124,7 @@
17
119
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
124
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
18
120
            DESTINATION ${CMAKE_INSTALL_PREFIX})
125
            DESTINATION ${CMAKE_INSTALL_PREFIX})
19
121
    install(FILES camera-apparmor.json
126
    install(FILES camera-apparmor.json
20
127
            camera-usermetrics.json
21
122
            DESTINATION ${CMAKE_INSTALL_PREFIX})
128
            DESTINATION ${CMAKE_INSTALL_PREFIX})
22
123
    install(FILES camera-contenthub.json
129
    install(FILES camera-contenthub.json
23
124
            DESTINATION ${CMAKE_INSTALL_PREFIX})
130
            DESTINATION ${CMAKE_INSTALL_PREFIX})
24
125
131
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
5
        "camera",
5
        "camera",
30
6
        "audio",
6
        "audio",
31
7
        "video",
7
        "video",
32
8
        "usermetrics",
33
9
        "content_exchange",
8
        "content_exchange",
34
10
        "content_exchange_source",
9
        "content_exchange_source",
35
11
        "location"
10
        "location"
36
12
11
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
5
usr/share/camera-app/*.js
5
usr/share/camera-app/*.js
43
6
usr/share/camera-app/assets/*
6
usr/share/camera-app/assets/*
44
7
usr/share/icons
7
usr/share/icons
45
8
usr/share/libusermetrics
46
8
usr/share/locale/*/LC_MESSAGES/camera-app.mo
9
usr/share/locale/*/LC_MESSAGES/camera-app.mo
47
9
10
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
18
               qtdeclarative5-usermetrics0.1,
18
               qtdeclarative5-usermetrics0.1,
53
19
               qtdeclarative5-ubuntu-content0.1,
19
               qtdeclarative5-ubuntu-content0.1,
54
20
               qtmultimedia5-dev,
20
               qtmultimedia5-dev,
56
21
               libusermetricsinput1-dev,
21
               libusermetricsinput1-dev (>= 1.2.0),
57
22
               gettext,
22
               gettext,
58
23
               dh-translations,
23
               dh-translations,
59
24
Standards-Version: 3.9.5
24
Standards-Version: 3.9.5
60
25
25
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
6
        "camera": {
6
        "camera": {
66
7
            "apparmor": "camera-apparmor.json",
7
            "apparmor": "camera-apparmor.json",
67
8
            "desktop": "@DESKTOP_FILE@",
8
            "desktop": "@DESKTOP_FILE@",
69
9
            "content-hub": "camera-contenthub.json"
9
            "content-hub": "camera-contenthub.json",
70
10
            "usermetrics": "camera-usermetrics.json"
71
10
        }
11
        }
72
11
    },
12
    },
73
12
    "icon": "@CAMERA_ICON@",
13
    "icon": "@CAMERA_ICON@",
74
@@ -21,4 +22,4 @@
75
21
    "x-test": {
22
    "x-test": {
76
22
        "autopilot": "@AUTOPILOT_DIR@"
23
        "autopilot": "@AUTOPILOT_DIR@"
77
23
    }
24
    }
78
24
}
79
25
\ No newline at end of file
25
\ No newline at end of file
80
26
}
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
Related bugs:	Link a bug report
Related blueprints:	Infographics component for Unity8, 14.10 tasks (Undefined)
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