on xenial help sign in
Move mock indicator service to unity8-fake-env, as it's a binary-dependent package.

Also, wrap-and-sort for good measure. Approved by: Nick Dedekind

commitf1f747b73fe5904d3faaaf8a8a744c29bc8f339d authorMichał Sawicz <michal.sawicz@canonical.com> dateWed 22 Apr 2015, 14:46 (11 years ago) parent87cd83f2d2db2d
6 files changed+12−11
debian/control+4−3 debian/indicators-client.install+1−1 debian/unity8-autopilot.install+1−3 debian/unity8-fake-env.install+2 debian/unity8-private.install+2−2 debian/unity8.install+2−2
debian/control+4−3
@@ -6,14 +6,14 @@ Build-Depends: cmake,
66 dbus-test-runner,
77 debhelper (>= 9),
88 doxyqml,
9− graphviz,
10− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
119# We rely on C++11 features, and to prevent from ABI breaks
1210# in libstdc++ causing us issues, we explicitly select a G++
1311# version. To allow cross-compiling to work, we also must
1412# append :native to g++-4.9 so we don't try to run armhf g++
1513# on an x86 CPU for eaxmple, when cross-compiling.
1614 g++-4.9:native,
15+ graphviz,
16+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1717 libconnectivity-qt1-dev,
1818 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1919 libgl1-mesa-dri,
@@ -169,6 +169,7 @@ Depends: ${misc:Depends},
169169 ${shlibs:Depends},
170170Provides: unity-application-impl,
171171 unity-application-impl-4,
172+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
172173Description: Fake environment for running Unity 8 shell
173174 Provides fake implementations of some QML modules used by Unity 8 shell
174175 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
@@ -180,8 +181,8 @@ Pre-Depends: ${misc:Pre-Depends},
180181Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
181182 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
182183 libhardware2,
183− unity-schemas (>= 7.3.1+14.10.20140915),
184184 pay-service,
185+ unity-schemas (>= 7.3.1+14.10.20140915),
185186 ${misc:Depends},
186187 ${shlibs:Depends},
187188Provides: unity-launcher-impl,
debian/indicators-client.install+1−1
@@ -1,2 +1,2 @@
1−usr/share/applications/indicators-client.desktop
21/usr/bin/indicators-client
2+usr/share/applications/indicators-client.desktop
debian/unity8-autopilot.install+1−3
@@ -1,4 +1,2 @@
1−data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
2−usr/bin/unity-mock-indicator-service
31usr/lib/python*/*/unity*
4−usr/share/unity8/unlock-device
2+usr/share/unity8/unlock-device
debian/unity8-fake-env.install+2
@@ -1,3 +1,5 @@
1+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
2+usr/bin/unity-mock-indicator-service
13usr/lib/*/unity8/qml/mocks
24usr/lib/*/unity8/qml/nonmirplugins
35usr/lib/*/unity8/qml/scopefakes
debian/unity8-private.install+2−2
@@ -1,16 +1,16 @@
11usr/lib/*/libunity8-private.*
2+usr/lib/*/unity8/libUbuntuGestures*
23usr/lib/*/unity8/qml/AccountsService
34usr/lib/*/unity8/qml/Dash
45usr/lib/*/unity8/qml/Greeter
56usr/lib/*/unity8/qml/LightDM
67usr/lib/*/unity8/qml/Lights
78usr/lib/*/unity8/qml/Powerd
8−usr/lib/*/unity8/qml/SessionBroadcast
99usr/lib/*/unity8/qml/ScreenGrabber
10+usr/lib/*/unity8/qml/SessionBroadcast
1011usr/lib/*/unity8/qml/Ubuntu
1112usr/lib/*/unity8/qml/Unity
1213usr/lib/*/unity8/qml/Utils
1314usr/lib/*/unity8/qml/Wizard
14−usr/lib/*/unity8/libUbuntuGestures*
1515usr/share/accountsservice/interfaces
1616usr/share/dbus-1/interfaces
debian/unity8.install+2−2
@@ -1,10 +1,10 @@
1−data/unity8.conf usr/share/upstart/sessions/
21data/unity8-dash.conf usr/share/upstart/sessions/
32data/unity8-filewatcher.conf usr/share/upstart/sessions/
3+data/unity8.conf usr/share/upstart/sessions/
44usr/bin/unity8
55usr/bin/unity8-dash
6−usr/share/applications/unity8.desktop
76usr/share/applications/unity8-dash.desktop
7+usr/share/applications/unity8.desktop
88usr/share/unity8/Greeter
99usr/share/unity8/Launcher
1010usr/share/unity8/Panel