git.iko.soy/unity8
on xenial help sign in
Install unity8-greeter.conf into /usr instead of /etc
7e9f51cMichael Terry
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -201,7 +201,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
201 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
201 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
202 )
202 )
203install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/51-${GREETER_APP}.conf
203install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/51-${GREETER_APP}.conf
204− DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/lightdm/lightdm.conf.d
204+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
205 )
205 )
206
206
207#
207#
debian/rules+1−2
@@ -19,8 +19,7 @@ override_dh_auto_clean:
19override_dh_auto_configure:
19override_dh_auto_configure:
20 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
20 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
21 # So until Debian bug 719148 is fixed, do it ourselves.
21 # So until Debian bug 719148 is fixed, do it ourselves.
22− dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
22+ dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var"
23− -DCMAKE_INSTALL_SYSCONFDIR="/etc"
24
23
25override_dh_install:
24override_dh_install:
26 # install autopilot tests
25 # install autopilot tests
debian/unity8-greeter.install+1−2
@@ -1,5 +1,4 @@
1−etc/lightdm
2usr/bin/unity8-greeter
1usr/bin/unity8-greeter
3−usr/share/lightdm/greeters/unity8-greeter.desktop
2+usr/share/lightdm
4usr/share/unity8/GreeterShell.qml
3usr/share/unity8/GreeterShell.qml
5usr/share/unity8/Greeter
4usr/share/unity8/Greeter