@@ -11,34 +11,34 @@ 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 libpulse-dev,
1718 libqmenumodel-dev (>= 0.2.7),
19+ libqt5xmlpatterns5-dev,
1820 libunity-api-dev (>= 7.80.6),
1921 libunity-mir-dev,
2022 libusermetricsoutput1-dev,
2123 libxcb1-dev,
22− libglib2.0-dev,
2324 pkg-config,
24− python:any (>= 2.7),
2525 python-setuptools,
2626 python3-all:any,
2727 python3-setuptools,
28+ python:any (>= 2.7),
2829 qt5-default,
2930 qtbase5-dev,
3031 qtbase5-dev-tools,
3132 qtbase5-private-dev,
3233 qtdeclarative5-dev,
3334 qtdeclarative5-dev-tools,
34− qtdeclarative5-qtmultimedia-plugin,
3535 qtdeclarative5-private-dev,
36+ qtdeclarative5-qtmultimedia-plugin,
3637 qtdeclarative5-qtquick2-plugin,
3738 qtdeclarative5-test-plugin,
3839 qtdeclarative5-ubuntu-settings-components,
3940 qtdeclarative5-ubuntu-ui-toolkit-plugin,
4041 qtdeclarative5-xmllistmodel-plugin,
41− libqt5xmlpatterns5-dev,
4242 ttf-ubuntu-font-family,
4343Standards-Version: 3.9.4
4444Homepage: http://launchpad.net/unity
@@ -60,7 +60,8 @@ Description: Indicators client test application
6060
6161Package: unity-scope-tool
6262Architecture: any
63−Depends: unity8 (= ${binary:Version}),
63+Depends: unity8-common (= ${source:Version}),
64+ unity8-private (= ${binary:Version}),
6465 ${misc:Depends},
6566 ${shlibs:Depends},
6667Description: Development tool for Unity scopes
@@ -71,27 +72,18 @@ Package: unity8
7172Architecture: any
7273Provides: indicator-renderer,
7374Depends: gsettings-desktop-schemas,
75+ libcap2-bin,
7476 libglib2.0-bin,
75− libunity-mir1,
77+ libunity-mir1 (>= 0.4),
7678 qmenumodel-qml (>= 0.2.7),
7779 qtdeclarative5-dee-plugin,
7880 qtdeclarative5-gsettings1.0,
7981 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,
8482 qtdeclarative5-xmllistmodel-plugin,
85− unity-application-impl-2,
8683 unity-launcher-impl-3,
87− unity-notifications-impl-2,
88− unity8-fake-env | unity-application-impl,
84+ unity8-common (= ${source:Version}),
8985 unity8-private (= ${binary:Version}),
9086 unity8-private | unity-launcher-impl,
91− unity-plugin-scopes | unity-scopes-impl,
92− unity-scopes-impl-0,
93−# for setcap:
94− libcap2-bin,
9587 ${misc:Depends},
9688 ${shlibs:Depends},
9789Recommends: unity-scope-click,
@@ -99,10 +91,30 @@ Recommends: unity-scope-click,
9991 unity-scope-scopes,
10092Breaks: indicator-network (<< 0.5.1),
10193 ubuntu-touch-session (<< 0.107),
102−Replaces: ubuntu-touch-session (<< 0.82~)
94+Replaces: ubuntu-touch-session (<< 0.82~),
10395Description: Unity 8 shell
10496 The Unity 8 shell is the primary user interface for Ubuntu devices.
10597
98+Package: unity8-common
99+Architecture: all
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,
109+ ${misc:Depends},
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.
114+ .
115+ This package contains the QML, graphics and locale files shared between
116+ unity8 and unity-scope-tool.
117+
106118Package: unity8-autopilot
107119Architecture: all
108120Depends: gir1.2-glib-2.0,
@@ -119,12 +131,12 @@ Depends: gir1.2-glib-2.0,
119131 python3-fixtures,
120132 python3-gi,
121133 ubuntu-ui-toolkit-autopilot,
122− unity8 (>= ${source:Version}),
123− unity8-fake-env (>= ${source:Version}),
134+ unity8 (= ${source:Version}),
135+ unity8-fake-env (= ${source:Version}),
124136 url-dispatcher-tools,
125137 ${misc:Depends},
126− ${python:Depends},
127138 ${python3:Depends},
139+ ${python:Depends},
128140 ${shlibs:Depends},
129141Description: Test package for Unity 8 shell
130142 Autopilot tests for the unity8 package
@@ -146,9 +158,9 @@ Architecture: any
146158Multi-Arch: same
147159Pre-Depends: ${misc:Pre-Depends},
148160Depends: gsettings-ubuntu-schemas,
161+ libunity-core-6.0-9,
149162 ${misc:Depends},
150163 ${shlibs:Depends},
151− libunity-core-6.0-9,
152164Provides: unity-launcher-impl,
153165 unity-launcher-impl-3,
154166Description: Unity 8 private libs