on xenial help sign in
Act on review comments
77bc486Michal Hruby
debian/control+2−1
@@ -78,7 +78,8 @@ Depends: gsettings-desktop-schemas,
78 unity8-fake-env | qtubuntu-shell,
78 unity8-fake-env | qtubuntu-shell,
79 unity8-private (= ${binary:Version}),
79 unity8-private (= ${binary:Version}),
80 unity8-private | unity-launcher-impl,
80 unity8-private | unity-launcher-impl,
81− unity-plugin-scopes | unity-scopes-impl | unity-scopes-impl-0,
81+ unity-plugin-scopes | unity-scopes-impl,
82+ unity-scopes-impl-0,
82# for setcap:
83# for setcap:
83 libcap2-bin,
84 libcap2-bin,
84 ${misc:Depends},
85 ${misc:Depends},
run+2
@@ -42,6 +42,8 @@ done
42if $FAKE; then
42if $FAKE; then
43 export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
43 export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
44 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
44 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
45+else
46+ export QML2_IMPORT_PATH=`pkg-config --variable=plugindir unity-shell-api`
45fi
47fi
46
48
47if $PINLOCK; then
49if $PINLOCK; then