git.iko.soy/unity8
on xenial help sign in
install the mock in the right dirs and clean lintian warnings by not inspecting those packages. Multiarch them as well
819c8c0Didier Roche
debian/control+15
compare with xenial
unifiedsplit
@@ -38,6 +38,7 @@ Package: unity8
38Architecture: any
38Architecture: any
39Depends: ${misc:Depends},
39Depends: ${misc:Depends},
40 ${shlibs:Depends},
40 ${shlibs:Depends},
41+ unity8-private (= ${binary:Version}),
41 indicators-client (>= 0.6.1),
42 indicators-client (>= 0.6.1),
42 qtdeclarative5-dee-plugin,
43 qtdeclarative5-dee-plugin,
43 qtdeclarative5-ubuntu-ui-toolkit-plugin,
44 qtdeclarative5-ubuntu-ui-toolkit-plugin,
@@ -55,8 +56,22 @@ Breaks: qml-phone-shell (<< 7.80~)
55Description: Unity 8 shell
56Description: Unity 8 shell
56 The Unity 8 shell is the primary user interface for Ubuntu devices.
57 The Unity 8 shell is the primary user interface for Ubuntu devices.
57
58
59+Package: unity8-private
60+Architecture: any
61+Multi-Arch: same
62+Pre-Depends: ${misc:Pre-Depends}
63+Depends: ${misc:Depends},
64+ ${shlibs:Depends},
65+Description: Unity 8 private libs
66+ The Unity 8 shell is the primary user interface for Ubuntu devices.
67+ .
68+ This package contains the private libraries for QML and other components
69+ only used by the shell.
70+
58Package: unity8-fake-env
71Package: unity8-fake-env
59Architecture: any
72Architecture: any
73+Multi-Arch: same
74+Pre-Depends: ${misc:Pre-Depends}
60Depends: ${misc:Depends},
75Depends: ${misc:Depends},
61 ${shlibs:Depends},
76 ${shlibs:Depends},
62Replaces: qml-phone-shell-fake-env (<< 7.80~)
77Replaces: qml-phone-shell-fake-env (<< 7.80~)
debian/rules+8−3
@@ -9,9 +9,6 @@ export NO_PNG_PKG_MANGLE=1
9%:
9%:
10 dh $@ --parallel --fail-missing --with python2
10 dh $@ --parallel --fail-missing --with python2
11
11
12−override_dh_shlibdeps:
13− dh_shlibdeps -XlibMockLightDM-qml.so
14−
15override_dh_install:
12override_dh_install:
16 # install autopilot tests
13 # install autopilot tests
17 cd tests/autopilot; \
14 cd tests/autopilot; \
@@ -21,3 +18,11 @@ override_dh_install:
21 cd $(CURDIR)
18 cd $(CURDIR)
22 dh_install -X'*.pyc' --fail-missing
19 dh_install -X'*.pyc' --fail-missing
23
20
21+# use private lib directories
22+override_dh_makeshlibs:
23+ dh_makeshlibs -Nunity8-private -Nunity8-fake-env
24+
25+# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
26+override_dh_shlibdeps:
27+ dh_shlibdeps -XlibMockLightDM-qml.so
28+
debian/unity8-fake-env.install+1−1
@@ -1 +1 @@
1−usr/share/unity8/plugins/mocks
1+usr/lib/*/unity8/qml/mocks
debian/unity8-private.installnew file+5
@@ -0,0 +1,5 @@
1+usr/lib/*/unity8/qml/HudClient
2+usr/lib/*/unity8/qml/LightDM
3+usr/lib/*/unity8/qml/Ubuntu
4+usr/lib/*/unity8/qml/Unity
5+usr/lib/*/unity8/qml/Utils
debian/unity8.install−5
@@ -13,8 +13,3 @@ usr/share/unity8/Panel
13usr/share/unity8/Shell.qml
13usr/share/unity8/Shell.qml
14usr/share/unity8/SideStage
14usr/share/unity8/SideStage
15usr/share/unity8/graphics
15usr/share/unity8/graphics
16−usr/lib/*/unity8/qml/HudClient
17−usr/lib/*/unity8/qml/LightDM
18−usr/lib/*/unity8/qml/Ubuntu
19−usr/lib/*/unity8/qml/Unity
20−usr/lib/*/unity8/qml/Utils
tests/mocks/LightDM/CMakeLists.txt+2−2
@@ -44,9 +44,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
44 )
44 )
45
45
46install(TARGETS MockLightDM-qml
46install(TARGETS MockLightDM-qml
47− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
47+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
48 )
48 )
49
49
50install(FILES qmldir
50install(FILES qmldir
51− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
51+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
52 )
52 )
tests/mocks/LightDM/full/CMakeLists.txt+1−1
@@ -16,5 +16,5 @@ set_target_properties(MockLightDM-full PROPERTIES
16 OUTPUT_NAME lightdm-qt5-2)
16 OUTPUT_NAME lightdm-qt5-2)
17
17
18install(TARGETS MockLightDM-full
18install(TARGETS MockLightDM-full
19− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/full
19+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/full
20 )
20 )
tests/mocks/LightDM/single-passphrase/CMakeLists.txt+1−1
@@ -17,5 +17,5 @@ set_target_properties(MockLightDM-single-passphrase PROPERTIES
17 OUTPUT_NAME lightdm-qt5-2)
17 OUTPUT_NAME lightdm-qt5-2)
18
18
19install(TARGETS MockLightDM-single-passphrase
19install(TARGETS MockLightDM-single-passphrase
20− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-passphrase
20+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-passphrase
21 )
21 )
tests/mocks/LightDM/single-pin/CMakeLists.txt+1−1
@@ -17,5 +17,5 @@ set_target_properties(MockLightDM-single-pin PROPERTIES
17 OUTPUT_NAME lightdm-qt5-2)
17 OUTPUT_NAME lightdm-qt5-2)
18
18
19install(TARGETS MockLightDM-single-pin
19install(TARGETS MockLightDM-single-pin
20− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-pin
20+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-pin
21 )
21 )
tests/mocks/LightDM/single/CMakeLists.txt+1−1
@@ -16,5 +16,5 @@ set_target_properties(MockLightDM-single PROPERTIES
16 OUTPUT_NAME lightdm-qt5-2)
16 OUTPUT_NAME lightdm-qt5-2)
17
17
18install(TARGETS MockLightDM-single
18install(TARGETS MockLightDM-single
19− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single
19+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single
20 )
20 )
tests/mocks/Ubuntu/Application/CMakeLists.txt+2−2
@@ -27,9 +27,9 @@ add_custom_target(InputFilterAreaQmlFile ALL
27)
27)
28
28
29install(TARGETS FakeUbuntuApplicationQml
29install(TARGETS FakeUbuntuApplicationQml
30− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
30+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
31 )
31 )
32
32
33install(FILES qmldir InputFilterArea.qml
33install(FILES qmldir InputFilterArea.qml
34− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
34+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
35 )
35 )