Lubuntu default settings

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

  1. fix-session
  2. Merge into trunk
Proposed by Unit 193
Status: Merged
Merge reported by: Julien Lavergne
Merged at revision: not available
Proposed branch: lp:~unit193/lubuntu-default-settings/fix-session
Merge into: lp:lubuntu-default-settings
Diff against target: 236 lines (+12/-140)
17 files modified
debian/10-lubuntu-nexus7.conf (+2/-0)
debian/10-lubuntu.conf (+2/-0)
debian/10-lxgames.conf (+2/-0)
debian/10-qlubuntu.conf (+2/-0)
debian/lubuntu-default-session.install (+1/-0)
debian/lubuntu-default-session.postinst (+0/-15)
debian/lubuntu-default-session.postrm (+0/-16)
debian/lubuntu-default-settings.postrm (+0/-16)
debian/lubuntu-nexus7-default-session.install (+1/-0)
debian/lubuntu-nexus7-default-session.postinst (+0/-15)
debian/lubuntu-nexus7-default-session.postrm (+0/-16)
debian/lxgames-default-session.install (+1/-0)
debian/lxgames-default-session.postinst (+0/-15)
debian/lxgames-default-session.postrm (+0/-16)
debian/qlubuntu-default-session.install (+1/-0)
debian/qlubuntu-default-session.postinst (+0/-15)
debian/qlubuntu-default-session.postrm (+0/-16)
To merge this branch: bzr merge lp:~unit193/lubuntu-default-settings/fix-session
Reviewer Review Type Date Requested Status
Julien Lavergne (community) Approve
Review via email: mp+198189@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

Revision history for this message
Phill Whiteside (phillw) wrote :

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?

Revision history for this message
Julien Lavergne (gilir) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1[SeatDefaults]
2user-session=lubuntu-nexus7
03
=== 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 @@
1[SeatDefaults]
2user-session=Lubuntu
03
=== 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 @@
1[SeatDefaults]
2user-session=lxgames
03
=== 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 @@
1[SeatDefaults]
2user-session=qlubuntu
03
=== 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 @@
1debian/10-lubuntu.conf etc/lightdm/lightdm.conf.d/
02
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 configure|upgrade)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true
9 /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14#DEBHELPER#
15exit 0
160
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 remove|purge)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
9 /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14
15#DEBHELPER#
16exit 0
170
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 remove|purge)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
9 /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14
15#DEBHELPER#
16exit 0
170
=== 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 @@
1debian/10-lubuntu-nexus7.conf etc/lightdm/lightdm.conf.d/
02
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 configure|upgrade)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lubuntu-nexus7 || true
9 /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14#DEBHELPER#
15exit 0
160
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 remove|purge)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --remove --session=lubuntu-nexus7 || true
9 /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14
15#DEBHELPER#
16exit 0
170
=== 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 @@
1debian/10-lxgames.conf etc/lightdm/lightdm.conf.d/
02
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 configure|upgrade)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lxgames || true
9 /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14#DEBHELPER#
15exit 0
160
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 remove|purge)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --remove --session=lxgames || true
9 /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
10 fi
11 ;;
12esac
13
14
15#DEBHELPER#
16exit 0
170
=== 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 @@
1debian/10-qlubuntu.conf etc/lightdm/lightdm.conf.d/
02
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 configure|upgrade)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=qlubuntu || true
9 /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-kde-greeter || true
10 fi
11 ;;
12esac
13
14#DEBHELPER#
15exit 0
160
=== 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 @@
1#!/bin/sh -e
2
3set -e
4
5case "$1" in
6 remove|purge)
7 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
8 /usr/lib/lightdm/lightdm-set-defaults --remove --session=qlubuntu || true
9 /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-kde-greeter || true
10 fi
11 ;;
12esac
13
14
15#DEBHELPER#
16exit 0

Subscribers

People subscribed via source and target branches

to all changes: