@@ -11,34 +11,34 @@ Build-Depends: cmake,
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
12 libgl1-mesa-dri,
12 libgl1-mesa-dri,
13 libgles2-mesa-dev[armhf],
13 libgles2-mesa-dev[armhf],
14 libgsettings-qt-dev,
15 libgsettings-qt-dev,
15 libhud-client2-dev,
16 libhud-client2-dev,
16 libpulse-dev,
17 libpulse-dev,
17 libqmenumodel-dev (>= 0.2.7),
18 libqmenumodel-dev (>= 0.2.7),
19+ libqt5xmlpatterns5-dev,
18 libunity-api-dev (>= 7.80.6),
20 libunity-api-dev (>= 7.80.6),
19 libunity-mir-dev,
21 libunity-mir-dev,
20 libusermetricsoutput1-dev,
22 libusermetricsoutput1-dev,
21 libxcb1-dev,
23 libxcb1-dev,
23 pkg-config,
24 pkg-config,
25 python-setuptools,
25 python-setuptools,
26 python3-all:any,
26 python3-all:any,
27 python3-setuptools,
27 python3-setuptools,
28 qt5-default,
29 qt5-default,
29 qtbase5-dev,
30 qtbase5-dev,
30 qtbase5-dev-tools,
31 qtbase5-dev-tools,
31 qtbase5-private-dev,
32 qtbase5-private-dev,
32 qtdeclarative5-dev,
33 qtdeclarative5-dev,
33 qtdeclarative5-dev-tools,
34 qtdeclarative5-dev-tools,
34− qtdeclarative5-qtmultimedia-plugin,
35 qtdeclarative5-private-dev,
35 qtdeclarative5-private-dev,
36+ qtdeclarative5-qtmultimedia-plugin,
36 qtdeclarative5-qtquick2-plugin,
37 qtdeclarative5-qtquick2-plugin,
37 qtdeclarative5-test-plugin,
38 qtdeclarative5-test-plugin,
38 qtdeclarative5-ubuntu-settings-components,
39 qtdeclarative5-ubuntu-settings-components,
39 qtdeclarative5-ubuntu-ui-toolkit-plugin,
40 qtdeclarative5-ubuntu-ui-toolkit-plugin,
40 qtdeclarative5-xmllistmodel-plugin,
41 qtdeclarative5-xmllistmodel-plugin,
41− libqt5xmlpatterns5-dev,
42 ttf-ubuntu-font-family,
42 ttf-ubuntu-font-family,
43Standards-Version: 3.9.4
43Standards-Version: 3.9.4
44Homepage: http://launchpad.net/unity
44Homepage: http://launchpad.net/unity
@@ -60,7 +60,8 @@ Description: Indicators client test application
61Package: unity-scope-tool
61Package: unity-scope-tool
62Architecture: any
62Architecture: any
63+Depends: unity8-common (= ${source:Version}),
63−Depends: unity8 (= ${binary:Version}),
64+ unity8-private (= ${binary:Version}),
64 ${misc:Depends},
65 ${misc:Depends},
65 ${shlibs:Depends},
66 ${shlibs:Depends},
66Description: Development tool for Unity scopes
67Description: Development tool for Unity scopes
@@ -71,27 +72,18 @@ Package: unity8
71Architecture: any
72Architecture: any
72Provides: indicator-renderer,
73Provides: indicator-renderer,
73Depends: gsettings-desktop-schemas,
74Depends: gsettings-desktop-schemas,
74 libglib2.0-bin,
76 libglib2.0-bin,
75− libunity-mir1,
77+ libunity-mir1 (>= 0.4),
76 qmenumodel-qml (>= 0.2.7),
78 qmenumodel-qml (>= 0.2.7),
77 qtdeclarative5-dee-plugin,
79 qtdeclarative5-dee-plugin,
78 qtdeclarative5-gsettings1.0,
80 qtdeclarative5-gsettings1.0,
79 qtdeclarative5-ubuntu-settings-components,
81 qtdeclarative5-ubuntu-settings-components,
80− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
81− ubuntu-thumbnailer-impl-0,
82− qtdeclarative5-ubuntu-ui-toolkit-plugin,
83− qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
84 qtdeclarative5-xmllistmodel-plugin,
82 qtdeclarative5-xmllistmodel-plugin,
85− unity-application-impl-2,
86 unity-launcher-impl-3,
83 unity-launcher-impl-3,
87− unity-notifications-impl-2,
84+ unity8-common (= ${source:Version}),
88− unity8-fake-env | unity-application-impl,
89 unity8-private (= ${binary:Version}),
85 unity8-private (= ${binary:Version}),
90 unity8-private | unity-launcher-impl,
86 unity8-private | unity-launcher-impl,
91− unity-plugin-scopes | unity-scopes-impl,
95 ${misc:Depends},
87 ${misc:Depends},
96 ${shlibs:Depends},
88 ${shlibs:Depends},
97Recommends: unity-scope-click,
89Recommends: unity-scope-click,
@@ -99,10 +91,30 @@ Recommends: unity-scope-click,
99 unity-scope-scopes,
91 unity-scope-scopes,
100Breaks: indicator-network (<< 0.5.1),
92Breaks: indicator-network (<< 0.5.1),
101 ubuntu-touch-session (<< 0.107),
93 ubuntu-touch-session (<< 0.107),
102−Replaces: ubuntu-touch-session (<< 0.82~)
94+Replaces: ubuntu-touch-session (<< 0.82~),
103Description: Unity 8 shell
95Description: Unity 8 shell
104 The Unity 8 shell is the primary user interface for Ubuntu devices.
96 The Unity 8 shell is the primary user interface for Ubuntu devices.
98+Package: unity8-common
100+Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
101+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
102+ qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
103+ ubuntu-thumbnailer-impl-0,
104+ unity-application-impl-2,
105+ unity-notifications-impl-2,
106+ unity-plugin-scopes | unity-scopes-impl,
107+ unity-scopes-impl-0,
108+ unity8-fake-env | unity-application-impl,
110+Breaks: unity8 (<< 7.86),
111+Replaces: unity8 (<< 7.86),
112+Description: Unity 8 shell (common files)
113+ The Unity 8 shell is the primary user interface for Ubuntu devices.
115+ This package contains the QML, graphics and locale files shared between
116+ unity8 and unity-scope-tool.
106Package: unity8-autopilot
118Package: unity8-autopilot
107Architecture: all
119Architecture: all
108Depends: gir1.2-glib-2.0,
120Depends: gir1.2-glib-2.0,
@@ -119,12 +131,12 @@ Depends: gir1.2-glib-2.0,
119 python3-fixtures,
131 python3-fixtures,
120 python3-gi,
132 python3-gi,
121 ubuntu-ui-toolkit-autopilot,
133 ubuntu-ui-toolkit-autopilot,
122− unity8 (>= ${source:Version}),
134+ unity8 (= ${source:Version}),
123− unity8-fake-env (>= ${source:Version}),
135+ unity8-fake-env (= ${source:Version}),
124 url-dispatcher-tools,
136 url-dispatcher-tools,
125 ${misc:Depends},
137 ${misc:Depends},
127 ${python3:Depends},
138 ${python3:Depends},
128 ${shlibs:Depends},
140 ${shlibs:Depends},
129Description: Test package for Unity 8 shell
141Description: Test package for Unity 8 shell
130 Autopilot tests for the unity8 package
142 Autopilot tests for the unity8 package
@@ -146,9 +158,9 @@ Architecture: any
146Multi-Arch: same
158Multi-Arch: same
147Pre-Depends: ${misc:Pre-Depends},
159Pre-Depends: ${misc:Pre-Depends},
148Depends: gsettings-ubuntu-schemas,
160Depends: gsettings-ubuntu-schemas,
161+ libunity-core-6.0-9,
149 ${misc:Depends},
162 ${misc:Depends},
150 ${shlibs:Depends},
163 ${shlibs:Depends},
151− libunity-core-6.0-9,
152Provides: unity-launcher-impl,
164Provides: unity-launcher-impl,
153 unity-launcher-impl-3,
165 unity-launcher-impl-3,
154Description: Unity 8 private libs
166Description: Unity 8 private libs