on xenial help sign in
Add arm64 support, drop unnecessary B-D on web plugin
63f99e4Michał Sawicz
debian/control+7−8
@@ -7,7 +7,7 @@ Build-Depends: cmake,
7 debhelper (>= 9),
7 debhelper (>= 9),
8 doxyqml,
8 doxyqml,
9# To allow cross-compiling to work, we also must append :native
9# To allow cross-compiling to work, we also must append :native
10−# to g++ so we don't try to run armhf g++
10+# to g++ so we don't try to run arm g++
11# on an x86 CPU for example, when cross-compiling.
11# on an x86 CPU for example, when cross-compiling.
12 g++:native,
12 g++:native,
13 libandroid-properties-dev,
13 libandroid-properties-dev,
@@ -16,9 +16,9 @@ Build-Depends: cmake,
16 libconnectivity-qt1-dev (>= 0.7.1),
16 libconnectivity-qt1-dev (>= 0.7.1),
17 libevdev-dev,
17 libevdev-dev,
18 libgeonames-dev (>= 0.2),
18 libgeonames-dev (>= 0.2),
19− libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
19+ libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
20 libgl1-mesa-dri,
20 libgl1-mesa-dri,
21− libgles2-mesa-dev[armhf],
21+ libgles2-mesa-dev[arm64 armhf],
22 libglib2.0-dev,
22 libglib2.0-dev,
23 libgsettings-qt-dev,
23 libgsettings-qt-dev,
24 libhardware-dev,
24 libhardware-dev,
@@ -33,9 +33,9 @@ Build-Depends: cmake,
33 libunity-api-dev (>= 7.112),
33 libunity-api-dev (>= 7.112),
34 libusermetricsoutput1-dev,
34 libusermetricsoutput1-dev,
35# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
35# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
36− libx11-dev[!armhf],
36+ libx11-dev[!arm64 !armhf],
37− libxcb1-dev[!armhf],
37+ libxcb1-dev[!arm64 !armhf],
38− libxi-dev[!armhf],
38+ libxi-dev[!arm64 !armhf],
39# End of X11 libs
39# End of X11 libs
40 pkg-config,
40 pkg-config,
41 python3-all:any,
41 python3-all:any,
@@ -57,7 +57,6 @@ Build-Depends: cmake,
57 qtdeclarative5-ubuntu-content1,
57 qtdeclarative5-ubuntu-content1,
58 qtdeclarative5-ubuntu-settings-components (>= 0.7),
58 qtdeclarative5-ubuntu-settings-components (>= 0.7),
59 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
59 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
60− qtdeclarative5-ubuntu-web-plugin,
61 ttf-ubuntu-font-family,
60 ttf-ubuntu-font-family,
62Standards-Version: 3.9.4
61Standards-Version: 3.9.4
63Homepage: http://launchpad.net/unity
62Homepage: http://launchpad.net/unity
@@ -70,7 +69,7 @@ XS-Testsuite: autopkgtest
70X-Ubuntu-Use-Langpack: yes
69X-Ubuntu-Use-Langpack: yes
71
70
72Package: indicators-client
71Package: indicators-client
73−Architecture: amd64 armhf i386
72+Architecture: any
74Depends: qmenumodel-qml (>= 0.2.9),
73Depends: qmenumodel-qml (>= 0.2.9),
75 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
74 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
76 unity8 (= ${binary:Version}),
75 unity8 (= ${binary:Version}),