Guest session:

- Make the startup dialog work also in Kubuntu
- Make sleep time before starting the dialog configurable
- Remove possible /media/guest-XXXXXX folder.

Approved by PS Jenkins bot, Robert Ancell.

diff --git a/configure.ac b/configure.ac
index 347481885118cf03f35ab26bb5c52ab0120d1fd1..b12ae29189cdcc80fc54ead189f5faa5ac3fce1e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ AC_ARG_ENABLE(liblightdm-qt,
        [enable_liblightdm_qt4=$enableval],
        [enable_liblightdm_qt4="auto"])
 compile_liblightdm_qt4=no
-if test x"$enable_liblightdm_qt4" != "xno"; then
+if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xauto" -a x$compile_liblightdm_gobject = xyes \) ; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
         QtCore
         QtDBus
@@ -107,6 +107,10 @@ if test x"$enable_liblightdm_qt4" != "xno"; then
      if test x"$(readlink $(which $MOC4))" = xqtchooser; then
          MOC4="$MOC4 --qt=qt4"
      fi
+     if test "x$compile_liblightdm_gobject" != xyes; then
+         AC_MSG_FAILURE(
+           [liblightdm-gobject is required to compile liblightdm-qt])
+     fi
     ],
     [if test "x$enable_liblightdm_qt4" != xauto; then
         AC_MSG_FAILURE(

diff --git a/debian/lightdm.install b/debian/lightdm.install
index cdad60cc23ef4e904e3aa9ed97fc82a90dd3e2d7..726383b76b157f73c45d0bf38375fc57259d5cc4 100644 (file)
--- a/debian/lightdm.install
+++ b/debian/lightdm.install
@@ -13,6 +13,6 @@ debian/guest-account usr/sbin
 debian/guest-session-auto.sh usr/lib/lightdm
 debian/lightdm-greeter-session usr/lib/lightdm
 debian/source_lightdm.py usr/share/apport/package-hooks
-debian/50-xserver-command.conf etc/lightdm/lightdm.conf.d
-debian/50-greeter-wrapper.conf etc/lightdm/lightdm.conf.d
-debian/50-guest-wrapper.conf etc/lightdm/lightdm.conf.d
+debian/50-xserver-command.conf usr/share/lightdm/lightdm.conf.d
+debian/50-greeter-wrapper.conf usr/share/lightdm/lightdm.conf.d
+debian/50-guest-wrapper.conf usr/share/lightdm/lightdm.conf.d

diff --git a/debian/lightdm.maintscript b/debian/lightdm.maintscript
new file mode 100644 (file)
index 0000000..03cd678
--- /dev/null
+++ b/debian/lightdm.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/lightdm/lightdm.conf.d/50-xserver-command.conf 1.9.5-0ubuntu1
+rm_conffile /etc/lightdm/lightdm.conf.d/50-greeter-wrapper.conf 1.9.5-0ubuntu1
+rm_conffile /etc/lightdm/lightdm.conf.d/50-guest-wrapper.conf 1.9.5-0ubuntu1