1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2015-11-18 06:44:35 +0000
3
+++ CMakeLists.txt	2016-12-14 15:08:09 +0000
4
@@ -136,6 +136,9 @@
5
136
else(CLICK_MODE)
136
else(CLICK_MODE)
6
137
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
137
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
7
138
        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
138
        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
8
139
    install(FILES camera-contenthub.json
9
140
        DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers
10
141
        RENAME camera-app)
11
139
endif(CLICK_MODE)
142
endif(CLICK_MODE)
12
140
143
13
141
add_subdirectory(CameraApp)
144
add_subdirectory(CameraApp)
14
142
145
15
=== added directory 'debian/apparmor'
16
=== added file 'debian/apparmor/camera-app'
17
--- debian/apparmor/camera-app	1970-01-01 00:00:00 +0000
18
+++ debian/apparmor/camera-app	2016-12-14 15:08:09 +0000
19
@@ -0,0 +1,15 @@
20
1
# vim:syntax=apparmor
21
2
#include <tunables/global>
22
3
23
4
# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
24
5
# exec inherits from this profile
25
6
profile camera-app (attach_disconnected) {
26
7
  network,
27
8
  / rwkl,
28
9
  /** rwlkm,
29
10
  /** pix,
30
11
  dbus,
31
12
  signal,
32
13
  ptrace,
33
14
  unix,
34
15
}
35
0
16
36
=== modified file 'debian/camera-app.install'
37
--- debian/camera-app.install	2014-09-01 11:30:28 +0000
38
+++ debian/camera-app.install	2016-12-14 15:08:09 +0000
39
@@ -6,3 +6,5 @@
40
6
usr/share/camera-app/assets/*
6
usr/share/camera-app/assets/*
41
7
usr/share/icons
7
usr/share/icons
42
8
usr/share/locale/*/LC_MESSAGES/camera-app.mo
8
usr/share/locale/*/LC_MESSAGES/camera-app.mo
43
9
usr/share/content-hub
44
10
debian/apparmor/camera-app etc/apparmor.d
45
9
11
46
=== modified file 'debian/control'
47
--- debian/control	2016-11-24 19:03:33 +0000
48
+++ debian/control	2016-12-14 15:08:09 +0000
49
@@ -5,6 +5,7 @@
50
5
XSBC-Original-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
5
XSBC-Original-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
51
6
Build-Depends: cmake,
6
Build-Depends: cmake,
52
7
               debhelper (>= 9),
7
               debhelper (>= 9),
53
8
               dh-apparmor,
54
8
               libgl1-mesa-dev | libgl1-dev,
9
               libgl1-mesa-dev | libgl1-dev,
55
9
               libgles2-mesa-dev | libgles2-dev,
10
               libgles2-mesa-dev | libgles2-dev,
56
10
               pkg-config,
11
               pkg-config,
57
11
12
58
=== modified file 'debian/rules'
59
--- debian/rules	2016-08-23 09:40:44 +0000
60
+++ debian/rules	2016-12-14 15:08:09 +0000
61
@@ -23,6 +23,7 @@
62
23
23
63
24
override_dh_install:
24
override_dh_install:
64
25
	dh_install --fail-missing
25
	dh_install --fail-missing
65
26
	dh_apparmor -pcamera-app --profile-name=camera-app
66
26
27
67
27
override_dh_translations:
28
override_dh_translations:
68
28
	# Override dh_translations to work around http://pad.lv/1183262.
29
	# Override dh_translations to work around http://pad.lv/1183262.
Status:	Merged
Approved by:	Bill Filler on 2016-12-19
Approved revision:	677
Merged at revision:	679
Proposed branch:	lp:~ken-vandine/camera-app/content-hub_and_add-profile
Merge into:	lp:camera-app
Diff against target:	68 lines (+22/-0) 5 files modified CMakeLists.txt (+3/-0) debian/apparmor/camera-app (+15/-0) debian/camera-app.install (+2/-0) debian/control (+1/-0) debian/rules (+1/-0)
To merge this branch:	bzr merge lp:~ken-vandine/camera-app/content-hub_and_add-profile
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-12-14
Ubuntu Phablet Team		2016-12-14	Pending
Review via email: mp+313232@code.launchpad.net