@@ -11,35 +11,35 @@ Build-Depends: cmake,
1111 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1212 libgl1-mesa-dri,
1313 libgles2-mesa-dev[armhf],
14+ libglib2.0-dev,
1415 libgsettings-qt-dev,
1516 libhud-client2-dev,
1617 liblightdm-qt5-3-dev,
1718 libpulse-dev,
1819 libqmenumodel-dev (>= 0.2.7),
20+ libqt5xmlpatterns5-dev,
1921 libunity-api-dev (>= 7.80.6),
2022 libunity-mir-dev,
2123 libusermetricsoutput1-dev,
2224 libxcb1-dev,
23− libglib2.0-dev,
2425 pkg-config,
25− python:any (>= 2.7),
2626 python-setuptools,
2727 python3-all:any,
2828 python3-setuptools,
29+ python:any (>= 2.7),
2930 qt5-default,
3031 qtbase5-dev,
3132 qtbase5-dev-tools,
3233 qtbase5-private-dev,
3334 qtdeclarative5-dev,
3435 qtdeclarative5-dev-tools,
35− qtdeclarative5-qtmultimedia-plugin,
3636 qtdeclarative5-private-dev,
37+ qtdeclarative5-qtmultimedia-plugin,
3738 qtdeclarative5-qtquick2-plugin,
3839 qtdeclarative5-test-plugin,
3940 qtdeclarative5-ubuntu-settings-components,
4041 qtdeclarative5-ubuntu-ui-toolkit-plugin,
4142 qtdeclarative5-xmllistmodel-plugin,
42− libqt5xmlpatterns5-dev,
4343 ttf-ubuntu-font-family,
4444Standards-Version: 3.9.4
4545Homepage: http://launchpad.net/unity
@@ -61,7 +61,8 @@ Description: Indicators client test application
6161
6262Package: unity-scope-tool
6363Architecture: any
64−Depends: unity8 (= ${binary:Version}),
64+Depends: unity8-common (= ${source:Version}),
65+ unity8-private (= ${binary:Version}),
6566 ${misc:Depends},
6667 ${shlibs:Depends},
6768Description: Development tool for Unity scopes
@@ -72,28 +73,19 @@ Package: unity8
7273Architecture: any
7374Provides: indicator-renderer,
7475Depends: gsettings-desktop-schemas,
76+ libcap2-bin,
7577 libglib2.0-bin,
76− libunity-mir1,
78+ libunity-mir1 (>= 0.4),
7779 qmenumodel-qml (>= 0.2.7),
7880 qtdeclarative5-dee-plugin,
7981 qtdeclarative5-gsettings1.0,
8082 qtdeclarative5-ubuntu-settings-components,
81− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
82− ubuntu-thumbnailer-impl-0,
83− qtdeclarative5-ubuntu-ui-toolkit-plugin,
84− qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
8583 qtdeclarative5-xmllistmodel-plugin,
86− unity-application-impl-2,
8784 unity-greeter-session-broadcast,
8885 unity-launcher-impl-3,
89− unity-notifications-impl-2,
90− unity8-fake-env | unity-application-impl,
86+ unity8-common (= ${source:Version}),
9187 unity8-private (= ${binary:Version}),
9288 unity8-private | unity-launcher-impl,
93− unity-plugin-scopes | unity-scopes-impl,
94− unity-scopes-impl-0,
95−# for setcap:
96− libcap2-bin,
9789 ${misc:Depends},
9890 ${shlibs:Depends},
9991Recommends: unity-scope-click,
@@ -101,7 +93,7 @@ Recommends: unity-scope-click,
10193 unity-scope-scopes,
10294Breaks: indicator-network (<< 0.5.1),
10395 ubuntu-touch-session (<< 0.107),
104−Replaces: ubuntu-touch-session (<< 0.82~)
96+Replaces: ubuntu-touch-session (<< 0.82~),
10597Description: Unity 8 shell
10698 The Unity 8 shell is the primary user interface for Ubuntu devices.
10799
@@ -110,14 +102,34 @@ Architecture: any
110102Depends: dbus-x11,
111103 libglib2.0-bin,
112104 lightdm,
113− unity8 (>= ${source:Version}),
105+ unity8 (= ${source:Version}),
114106 ${misc:Depends},
115107 ${shlibs:Depends},
116−Replaces: unity8 (<< 7.86),
117108Breaks: unity8 (<< 7.86),
109+Replaces: unity8 (<< 7.86),
118110Description: Ubuntu QML greeter
119111 The Ubuntu QML greeter is the primary greeter for Ubuntu devices.
120112
113+Package: unity8-common
114+Architecture: all
115+Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
116+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
117+ qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
118+ ubuntu-thumbnailer-impl-0,
119+ unity-application-impl-2,
120+ unity-notifications-impl-2,
121+ unity-plugin-scopes | unity-scopes-impl,
122+ unity-scopes-impl-0,
123+ unity8-fake-env | unity-application-impl,
124+ ${misc:Depends},
125+Breaks: unity8 (<< 7.86),
126+Replaces: unity8 (<< 7.86),
127+Description: Unity 8 shell (common files)
128+ The Unity 8 shell is the primary user interface for Ubuntu devices.
129+ .
130+ This package contains the QML, graphics and locale files shared between
131+ unity8 and unity-scope-tool.
132+
121133Package: unity8-autopilot
122134Architecture: all
123135Depends: gir1.2-glib-2.0,
@@ -134,13 +146,13 @@ Depends: gir1.2-glib-2.0,
134146 python3-fixtures,
135147 python3-gi,
136148 ubuntu-ui-toolkit-autopilot,
137− unity8 (>= ${source:Version}),
138− unity8-fake-env (>= ${source:Version}),
139− unity8-greeter (>= ${source:Version}),
149+ unity8 (= ${source:Version}),
150+ unity8-fake-env (= ${source:Version}),
151+ unity8-greeter (= ${source:Version}),
140152 url-dispatcher-tools,
141153 ${misc:Depends},
142− ${python:Depends},
143154 ${python3:Depends},
155+ ${python:Depends},
144156 ${shlibs:Depends},
145157Description: Test package for Unity 8 shell
146158 Autopilot tests for the unity8 package
@@ -162,9 +174,9 @@ Architecture: any
162174Multi-Arch: same
163175Pre-Depends: ${misc:Pre-Depends},
164176Depends: gsettings-ubuntu-schemas,
177+ libunity-core-6.0-9,
165178 ${misc:Depends},
166179 ${shlibs:Depends},
167− libunity-core-6.0-9,
168180Provides: unity-launcher-impl,
169181 unity-launcher-impl-3,
170182Description: Unity 8 private libs