1
=== modified file 'debian/control'
2
--- debian/control	2016-06-29 14:45:18 +0000
3
+++ debian/control	2016-07-20 13:27:49 +0000
4
@@ -8,7 +8,7 @@
5
8
               dh-apparmor,
8
               dh-apparmor,
6
9
               doxyqml,
9
               doxyqml,
7
10
# To allow cross-compiling to work, we also must append :native
10
# To allow cross-compiling to work, we also must append :native
9
11
# to g++ so we don't try to run armhf g++
11
# to g++ so we don't try to run arm g++
10
12
# on an x86 CPU for example, when cross-compiling.
12
# on an x86 CPU for example, when cross-compiling.
11
13
               g++:native,
13
               g++:native,
12
14
               libandroid-properties-dev,
14
               libandroid-properties-dev,
13
@@ -17,9 +17,9 @@
14
17
               libconnectivity-qt1-dev (>= 0.7.1),
17
               libconnectivity-qt1-dev (>= 0.7.1),
15
18
               libevdev-dev,
18
               libevdev-dev,
16
19
               libgeonames-dev (>= 0.2),
19
               libgeonames-dev (>= 0.2),
18
20
               libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
20
               libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
19
21
               libgl1-mesa-dri,
21
               libgl1-mesa-dri,
21
22
               libgles2-mesa-dev[armhf],
22
               libgles2-mesa-dev[arm64 armhf],
22
23
               libglib2.0-dev,
23
               libglib2.0-dev,
23
24
               libgsettings-qt-dev,
24
               libgsettings-qt-dev,
24
25
               libhardware-dev,
25
               libhardware-dev,
25
@@ -37,9 +37,9 @@
26
37
               libunity-api-dev (>= 7.115),
37
               libunity-api-dev (>= 7.115),
27
38
               libusermetricsoutput1-dev,
38
               libusermetricsoutput1-dev,
28
39
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
39
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
32
40
               libx11-dev[!armhf],
40
               libx11-dev[!arm64 !armhf],
33
41
               libxcb1-dev[!armhf],
41
               libxcb1-dev[!arm64 !armhf],
34
42
               libxi-dev[!armhf],
42
               libxi-dev[!arm64 !armhf],
35
43
# End of X11 libs
43
# End of X11 libs
36
44
               pkg-config,
44
               pkg-config,
37
45
               python3-all:any,
45
               python3-all:any,
38
@@ -74,7 +74,7 @@
39
74
X-Ubuntu-Use-Langpack: yes
74
X-Ubuntu-Use-Langpack: yes
40
75
75
41
76
Package: indicators-client
76
Package: indicators-client
43
77
Architecture: amd64 armhf i386
77
Architecture: any
44
78
Depends: qmenumodel-qml (>= 0.2.9),
78
Depends: qmenumodel-qml (>= 0.2.9),
45
79
         qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),
79
         qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),
46
80
         unity8 (= ${binary:Version}),
80
         unity8 (= ${binary:Version}),
Status:	Merged
Approved by:	Michael Terry on 2016-07-20
Approved revision:	2405
Merged at revision:	2571
Proposed branch:	lp:~saviq/unity8/build-arm64
Merge into:	lp:unity8
Diff against target:	46 lines (+7/-7) 1 file modified debian/control (+7/-7)
To merge this branch:	bzr merge lp:~saviq/unity8/build-arm64
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-20
Michael Terry		2016-05-24	Approve on 2016-07-20
Albert Astals Cid (community)			Needs Fixing on 2016-07-14
Ubuntu Unity PS integration team		2016-05-24	Pending
Review via email: mp+295573@code.launchpad.net
1	=== modified file 'debian/control'
2	--- debian/control 2016-06-29 14:45:18 +0000
3	+++ debian/control 2016-07-20 13:27:49 +0000
4	@@ -8,7 +8,7 @@
5	8	dh-apparmor,	8	dh-apparmor,
6	9	doxyqml,	9	doxyqml,
7	10	# To allow cross-compiling to work, we also must append :native	10	# To allow cross-compiling to work, we also must append :native
9	11	# to g++ so we don't try to run armhf g++	11	# to g++ so we don't try to run arm g++
10	12	# on an x86 CPU for example, when cross-compiling.	12	# on an x86 CPU for example, when cross-compiling.
11	13	g++:native,	13	g++:native,
12	14	libandroid-properties-dev,	14	libandroid-properties-dev,
13	@@ -17,9 +17,9 @@
14	17	libconnectivity-qt1-dev (>= 0.7.1),	17	libconnectivity-qt1-dev (>= 0.7.1),
15	18	libevdev-dev,	18	libevdev-dev,
16	19	libgeonames-dev (>= 0.2),	19	libgeonames-dev (>= 0.2),
18	20	libgl1-mesa-dev[!armhf] \| libgl-dev[!armhf],	20	libgl1-mesa-dev[!arm64 !armhf] \| libgl-dev[!arm64 !armhf],
19	21	libgl1-mesa-dri,	21	libgl1-mesa-dri,
21	22	libgles2-mesa-dev[armhf],	22	libgles2-mesa-dev[arm64 armhf],
22	23	libglib2.0-dev,	23	libglib2.0-dev,
23	24	libgsettings-qt-dev,	24	libgsettings-qt-dev,
24	25	libhardware-dev,	25	libhardware-dev,
25	@@ -37,9 +37,9 @@
26	37	libunity-api-dev (>= 7.115),	37	libunity-api-dev (>= 7.115),
27	38	libusermetricsoutput1-dev,	38	libusermetricsoutput1-dev,
28	39	# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop	39	# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
32	40	libx11-dev[!armhf],	40	libx11-dev[!arm64 !armhf],
33	41	libxcb1-dev[!armhf],	41	libxcb1-dev[!arm64 !armhf],
34	42	libxi-dev[!armhf],	42	libxi-dev[!arm64 !armhf],
35	43	# End of X11 libs	43	# End of X11 libs
36	44	pkg-config,	44	pkg-config,
37	45	python3-all:any,	45	python3-all:any,
38	@@ -74,7 +74,7 @@
39	74	X-Ubuntu-Use-Langpack: yes	74	X-Ubuntu-Use-Langpack: yes
40	75		75
41	76	Package: indicators-client	76	Package: indicators-client
43	77	Architecture: amd64 armhf i386	77	Architecture: any
44	78	Depends: qmenumodel-qml (>= 0.2.9),	78	Depends: qmenumodel-qml (>= 0.2.9),
45	79	qml-module-ubuntu-components (>= 1.3.1845) \| qml-module-ubuntu-components-gles (>= 1.3.1845),	79	qml-module-ubuntu-components (>= 1.3.1845) \| qml-module-ubuntu-components-gles (>= 1.3.1845),
46	80	unity8 (= ${binary:Version}),	80	unity8 (= ${binary:Version}),