Merge lp:~unit193/lubuntu-default-settings/fix-session into lp:lubuntu-default-settings

[Unit 193]

Lightdm as of Dec 4th no longer has lightdm-set-defaults, this is the "new" method in use. It is recommended that this is tested before committing.

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/ubuntu-settings/trusty/revision/10

[Nicholas Skaggs (nskaggs)]

Julien, your review is most appreciated. At the moment, the images are broken for "Try Lubuntu" mode.

[Phill Whiteside (phillw)]

https://launchpad.net/~nskaggs apply it. Then set up a respin of all lubuntu iso's. It can be rolled back, but with a borked system what have we to lose?

[Julien Lavergne (gilir)]

I merged the changes, and modify them a bit to match the recommend way describe at the lightdm mailing list. I pushed a testing package at lubuntu staging PPA, any testing are welcome.

review: Approve

=== added file 'debian/10-lubuntu-nexus7.conf'
--- debian/10-lubuntu-nexus7.conf	1970-01-01 00:00:00 +0000
+++ debian/10-lubuntu-nexus7.conf	2013-12-09 01:49:06 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=lubuntu-nexus7

=== added file 'debian/10-lubuntu.conf'
--- debian/10-lubuntu.conf	1970-01-01 00:00:00 +0000
+++ debian/10-lubuntu.conf	2013-12-09 01:49:06 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=Lubuntu

=== added file 'debian/10-lxgames.conf'
--- debian/10-lxgames.conf	1970-01-01 00:00:00 +0000
+++ debian/10-lxgames.conf	2013-12-09 01:49:06 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=lxgames

=== added file 'debian/10-qlubuntu.conf'
--- debian/10-qlubuntu.conf	1970-01-01 00:00:00 +0000
+++ debian/10-qlubuntu.conf	2013-12-09 01:49:06 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=qlubuntu

=== added file 'debian/lubuntu-default-session.install'
--- debian/lubuntu-default-session.install	1970-01-01 00:00:00 +0000
+++ debian/lubuntu-default-session.install	2013-12-09 01:49:06 +0000
@@ -0,0 +1,1 @@
+debian/10-lubuntu.conf  etc/lightdm/lightdm.conf.d/

=== removed file 'debian/lubuntu-default-session.postinst'
--- debian/lubuntu-default-session.postinst	2011-12-18 23:23:13 +0000
+++ debian/lubuntu-default-session.postinst	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  configure|upgrade)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/lubuntu-default-session.postrm'
--- debian/lubuntu-default-session.postrm	2011-12-18 23:23:13 +0000
+++ debian/lubuntu-default-session.postrm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/lubuntu-default-settings.postrm'
--- debian/lubuntu-default-settings.postrm	2012-11-17 23:53:33 +0000
+++ debian/lubuntu-default-settings.postrm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-
-#DEBHELPER#
-exit 0

=== added file 'debian/lubuntu-nexus7-default-session.install'
--- debian/lubuntu-nexus7-default-session.install	1970-01-01 00:00:00 +0000
+++ debian/lubuntu-nexus7-default-session.install	2013-12-09 01:49:06 +0000
@@ -0,0 +1,1 @@
+debian/10-lubuntu-nexus7.conf   etc/lightdm/lightdm.conf.d/

=== removed file 'debian/lubuntu-nexus7-default-session.postinst'
--- debian/lubuntu-nexus7-default-session.postinst	2012-11-27 21:00:19 +0000
+++ debian/lubuntu-nexus7-default-session.postinst	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  configure|upgrade)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lubuntu-nexus7 || true
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/lubuntu-nexus7-default-session.postrm'
--- debian/lubuntu-nexus7-default-session.postrm	2012-11-27 21:00:19 +0000
+++ debian/lubuntu-nexus7-default-session.postrm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=lubuntu-nexus7 || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-
-#DEBHELPER#
-exit 0

=== added file 'debian/lxgames-default-session.install'
--- debian/lxgames-default-session.install	1970-01-01 00:00:00 +0000
+++ debian/lxgames-default-session.install	2013-12-09 01:49:06 +0000
@@ -0,0 +1,1 @@
+debian/10-lxgames.conf  etc/lightdm/lightdm.conf.d/

=== removed file 'debian/lxgames-default-session.postinst'
--- debian/lxgames-default-session.postinst	2011-12-18 23:23:13 +0000
+++ debian/lxgames-default-session.postinst	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  configure|upgrade)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lxgames || true
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/lxgames-default-session.postrm'
--- debian/lxgames-default-session.postrm	2011-12-18 23:23:13 +0000
+++ debian/lxgames-default-session.postrm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=lxgames || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-
-#DEBHELPER#
-exit 0

=== added file 'debian/qlubuntu-default-session.install'
--- debian/qlubuntu-default-session.install	1970-01-01 00:00:00 +0000
+++ debian/qlubuntu-default-session.install	2013-12-09 01:49:06 +0000
@@ -0,0 +1,1 @@
+debian/10-qlubuntu.conf etc/lightdm/lightdm.conf.d/

=== removed file 'debian/qlubuntu-default-session.postinst'
--- debian/qlubuntu-default-session.postinst	2013-03-17 09:48:22 +0000
+++ debian/qlubuntu-default-session.postinst	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  configure|upgrade)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=qlubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-kde-greeter || true
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/qlubuntu-default-session.postrm'
--- debian/qlubuntu-default-session.postrm	2013-03-17 09:48:22 +0000
+++ debian/qlubuntu-default-session.postrm	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=qlubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-kde-greeter || true
-    fi
-    ;;
-esac
-
-
-#DEBHELPER#
-exit 0