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
commit819c8c04d8707fac92bf41c2b8bbae968893a968 authorDidier Roche <didrocks@ubuntu.com> dateWed 26 Jun 2013, 12:15 (13 years ago) parent31aa5c3
11 files changed+37−17
debian/control+15 debian/rules+8−3 debian/unity8-fake-env.install+1−1 debian/unity8-private.install+5 debian/unity8.install−5 tests/mocks/LightDM/CMakeLists.txt+2−2 tests/mocks/LightDM/full/CMakeLists.txt+1−1 tests/mocks/LightDM/single-passphrase/CMakeLists.txt+1−1 tests/mocks/LightDM/single-pin/CMakeLists.txt+1−1 tests/mocks/LightDM/single/CMakeLists.txt+1−1 tests/mocks/Ubuntu/Application/CMakeLists.txt+2−2
debian/control+15
@@ -38,6 +38,7 @@ Package: unity8
3838Architecture: any
3939Depends: ${misc:Depends},
4040 ${shlibs:Depends},
41+ unity8-private (= ${binary:Version}),
4142 indicators-client (>= 0.6.1),
4243 qtdeclarative5-dee-plugin,
4344 qtdeclarative5-ubuntu-ui-toolkit-plugin,
@@ -55,8 +56,22 @@ Breaks: qml-phone-shell (<< 7.80~)
5556Description: Unity 8 shell
5657 The Unity 8 shell is the primary user interface for Ubuntu devices.
5758
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+
5871Package: unity8-fake-env
5972Architecture: any
73+Multi-Arch: same
74+Pre-Depends: ${misc:Pre-Depends}
6075Depends: ${misc:Depends},
6176 ${shlibs:Depends},
6277Replaces: qml-phone-shell-fake-env (<< 7.80~)
debian/rules+8−3
@@ -9,9 +9,6 @@ export NO_PNG_PKG_MANGLE=1
99%:
1010 dh $@ --parallel --fail-missing --with python2
1111
12−override_dh_shlibdeps:
13− dh_shlibdeps -XlibMockLightDM-qml.so
14−
1512override_dh_install:
1613 # install autopilot tests
1714 cd tests/autopilot; \
@@ -21,3 +18,11 @@ override_dh_install:
2118 cd $(CURDIR)
2219 dh_install -X'*.pyc' --fail-missing
2320
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
1313usr/share/unity8/Shell.qml
1414usr/share/unity8/SideStage
1515usr/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"
4444 )
4545
4646install(TARGETS MockLightDM-qml
47− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
47+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
4848 )
4949
5050install(FILES qmldir
51− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM
51+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM
5252 )
tests/mocks/LightDM/full/CMakeLists.txt+1−1
@@ -16,5 +16,5 @@ set_target_properties(MockLightDM-full PROPERTIES
1616 OUTPUT_NAME lightdm-qt5-2)
1717
1818install(TARGETS MockLightDM-full
19− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/full
19+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/full
2020 )
tests/mocks/LightDM/single-passphrase/CMakeLists.txt+1−1
@@ -17,5 +17,5 @@ set_target_properties(MockLightDM-single-passphrase PROPERTIES
1717 OUTPUT_NAME lightdm-qt5-2)
1818
1919install(TARGETS MockLightDM-single-passphrase
20− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-passphrase
20+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-passphrase
2121 )
tests/mocks/LightDM/single-pin/CMakeLists.txt+1−1
@@ -17,5 +17,5 @@ set_target_properties(MockLightDM-single-pin PROPERTIES
1717 OUTPUT_NAME lightdm-qt5-2)
1818
1919install(TARGETS MockLightDM-single-pin
20− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-pin
20+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single-pin
2121 )
tests/mocks/LightDM/single/CMakeLists.txt+1−1
@@ -16,5 +16,5 @@ set_target_properties(MockLightDM-single PROPERTIES
1616 OUTPUT_NAME lightdm-qt5-2)
1717
1818install(TARGETS MockLightDM-single
19− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single
19+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/LightDM/single
2020 )
tests/mocks/Ubuntu/Application/CMakeLists.txt+2−2
@@ -27,9 +27,9 @@ add_custom_target(InputFilterAreaQmlFile ALL
2727)
2828
2929install(TARGETS FakeUbuntuApplicationQml
30− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
30+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
3131 )
3232
3333install(FILES qmldir InputFilterArea.qml
34− DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Ubuntu/Application
34+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application
3535 )