Add ubuntu-settings-components to build script.
Revert workaround for bug #1268578, got fixed upstream.
Drop GenericName from unity8.desktop.
commitb09affaaff2b5b3a955b4c5eee1cc6f32e0b4a01
authorMichał Sawicz <michal.sawicz@canonical.com>
dateTue 4 Feb 2014, 14:07 (13 years ago)
parentea44f8c96b4b44
build+1
@@ -45,6 +45,7 @@ install_dependencies() {
4545 qtdeclarative5-dee-plugin \
4646 qtdeclarative5-gsettings1.0 \
4747 qtdeclarative5-ubuntu-ui-toolkit-plugin \
48+ qtdeclarative5-ubuntu-settings-components \
4849 unity-notifications-impl \
4950 qtdeclarative5-xmllistmodel-plugin \
5051 ubuntu-mobile-icons \
data/unity8.desktop.in−1
@@ -1,7 +1,6 @@
11[Desktop Entry]
22Type=Application
33Name=Unity 8
4−GenericName=unity8
54Comment=The converged Unity shell
65Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8
76Terminal=false
tests/autopilot/unity8/shell/emulators/create_interactive_notification.py+1−1
@@ -87,7 +87,7 @@ if __name__ == '__main__':
8787 action_id,
8888 action_label,
8989 action_callback,
90− (None, ),
90+ None,
9191 None
9292 )
9393