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

Proposed by Unit 193 on 2013-12-09
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) 2013-12-09 Approve on 2013-12-13
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.
Nicholas Skaggs (nskaggs) wrote :

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

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?

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
1=== added file 'debian/10-lubuntu-nexus7.conf'
2--- debian/10-lubuntu-nexus7.conf 1970-01-01 00:00:00 +0000
3+++ debian/10-lubuntu-nexus7.conf 2013-12-09 01:49:06 +0000
4@@ -0,0 +1,2 @@
5+[SeatDefaults]
6+user-session=lubuntu-nexus7
7
8=== added file 'debian/10-lubuntu.conf'
9--- debian/10-lubuntu.conf 1970-01-01 00:00:00 +0000
10+++ debian/10-lubuntu.conf 2013-12-09 01:49:06 +0000
11@@ -0,0 +1,2 @@
12+[SeatDefaults]
13+user-session=Lubuntu
14
15=== added file 'debian/10-lxgames.conf'
16--- debian/10-lxgames.conf 1970-01-01 00:00:00 +0000
17+++ debian/10-lxgames.conf 2013-12-09 01:49:06 +0000
18@@ -0,0 +1,2 @@
19+[SeatDefaults]
20+user-session=lxgames
21
22=== added file 'debian/10-qlubuntu.conf'
23--- debian/10-qlubuntu.conf 1970-01-01 00:00:00 +0000
24+++ debian/10-qlubuntu.conf 2013-12-09 01:49:06 +0000
25@@ -0,0 +1,2 @@
26+[SeatDefaults]
27+user-session=qlubuntu
28
29=== added file 'debian/lubuntu-default-session.install'
30--- debian/lubuntu-default-session.install 1970-01-01 00:00:00 +0000
31+++ debian/lubuntu-default-session.install 2013-12-09 01:49:06 +0000
32@@ -0,0 +1,1 @@
33+debian/10-lubuntu.conf etc/lightdm/lightdm.conf.d/
34
35=== removed file 'debian/lubuntu-default-session.postinst'
36--- debian/lubuntu-default-session.postinst 2011-12-18 23:23:13 +0000
37+++ debian/lubuntu-default-session.postinst 1970-01-01 00:00:00 +0000
38@@ -1,15 +0,0 @@
39-#!/bin/sh -e
40-
41-set -e
42-
43-case "$1" in
44- configure|upgrade)
45- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
46- /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true
47- /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
48- fi
49- ;;
50-esac
51-
52-#DEBHELPER#
53-exit 0
54
55=== removed file 'debian/lubuntu-default-session.postrm'
56--- debian/lubuntu-default-session.postrm 2011-12-18 23:23:13 +0000
57+++ debian/lubuntu-default-session.postrm 1970-01-01 00:00:00 +0000
58@@ -1,16 +0,0 @@
59-#!/bin/sh -e
60-
61-set -e
62-
63-case "$1" in
64- remove|purge)
65- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
66- /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
67- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
68- fi
69- ;;
70-esac
71-
72-
73-#DEBHELPER#
74-exit 0
75
76=== removed file 'debian/lubuntu-default-settings.postrm'
77--- debian/lubuntu-default-settings.postrm 2012-11-17 23:53:33 +0000
78+++ debian/lubuntu-default-settings.postrm 1970-01-01 00:00:00 +0000
79@@ -1,16 +0,0 @@
80-#!/bin/sh -e
81-
82-set -e
83-
84-case "$1" in
85- remove|purge)
86- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
87- /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true
88- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
89- fi
90- ;;
91-esac
92-
93-
94-#DEBHELPER#
95-exit 0
96
97=== added file 'debian/lubuntu-nexus7-default-session.install'
98--- debian/lubuntu-nexus7-default-session.install 1970-01-01 00:00:00 +0000
99+++ debian/lubuntu-nexus7-default-session.install 2013-12-09 01:49:06 +0000
100@@ -0,0 +1,1 @@
101+debian/10-lubuntu-nexus7.conf etc/lightdm/lightdm.conf.d/
102
103=== removed file 'debian/lubuntu-nexus7-default-session.postinst'
104--- debian/lubuntu-nexus7-default-session.postinst 2012-11-27 21:00:19 +0000
105+++ debian/lubuntu-nexus7-default-session.postinst 1970-01-01 00:00:00 +0000
106@@ -1,15 +0,0 @@
107-#!/bin/sh -e
108-
109-set -e
110-
111-case "$1" in
112- configure|upgrade)
113- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
114- /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lubuntu-nexus7 || true
115- /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
116- fi
117- ;;
118-esac
119-
120-#DEBHELPER#
121-exit 0
122
123=== removed file 'debian/lubuntu-nexus7-default-session.postrm'
124--- debian/lubuntu-nexus7-default-session.postrm 2012-11-27 21:00:19 +0000
125+++ debian/lubuntu-nexus7-default-session.postrm 1970-01-01 00:00:00 +0000
126@@ -1,16 +0,0 @@
127-#!/bin/sh -e
128-
129-set -e
130-
131-case "$1" in
132- remove|purge)
133- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
134- /usr/lib/lightdm/lightdm-set-defaults --remove --session=lubuntu-nexus7 || true
135- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
136- fi
137- ;;
138-esac
139-
140-
141-#DEBHELPER#
142-exit 0
143
144=== added file 'debian/lxgames-default-session.install'
145--- debian/lxgames-default-session.install 1970-01-01 00:00:00 +0000
146+++ debian/lxgames-default-session.install 2013-12-09 01:49:06 +0000
147@@ -0,0 +1,1 @@
148+debian/10-lxgames.conf etc/lightdm/lightdm.conf.d/
149
150=== removed file 'debian/lxgames-default-session.postinst'
151--- debian/lxgames-default-session.postinst 2011-12-18 23:23:13 +0000
152+++ debian/lxgames-default-session.postinst 1970-01-01 00:00:00 +0000
153@@ -1,15 +0,0 @@
154-#!/bin/sh -e
155-
156-set -e
157-
158-case "$1" in
159- configure|upgrade)
160- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
161- /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lxgames || true
162- /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
163- fi
164- ;;
165-esac
166-
167-#DEBHELPER#
168-exit 0
169
170=== removed file 'debian/lxgames-default-session.postrm'
171--- debian/lxgames-default-session.postrm 2011-12-18 23:23:13 +0000
172+++ debian/lxgames-default-session.postrm 1970-01-01 00:00:00 +0000
173@@ -1,16 +0,0 @@
174-#!/bin/sh -e
175-
176-set -e
177-
178-case "$1" in
179- remove|purge)
180- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
181- /usr/lib/lightdm/lightdm-set-defaults --remove --session=lxgames || true
182- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
183- fi
184- ;;
185-esac
186-
187-
188-#DEBHELPER#
189-exit 0
190
191=== added file 'debian/qlubuntu-default-session.install'
192--- debian/qlubuntu-default-session.install 1970-01-01 00:00:00 +0000
193+++ debian/qlubuntu-default-session.install 2013-12-09 01:49:06 +0000
194@@ -0,0 +1,1 @@
195+debian/10-qlubuntu.conf etc/lightdm/lightdm.conf.d/
196
197=== removed file 'debian/qlubuntu-default-session.postinst'
198--- debian/qlubuntu-default-session.postinst 2013-03-17 09:48:22 +0000
199+++ debian/qlubuntu-default-session.postinst 1970-01-01 00:00:00 +0000
200@@ -1,15 +0,0 @@
201-#!/bin/sh -e
202-
203-set -e
204-
205-case "$1" in
206- configure|upgrade)
207- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
208- /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=qlubuntu || true
209- /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-kde-greeter || true
210- fi
211- ;;
212-esac
213-
214-#DEBHELPER#
215-exit 0
216
217=== removed file 'debian/qlubuntu-default-session.postrm'
218--- debian/qlubuntu-default-session.postrm 2013-03-17 09:48:22 +0000
219+++ debian/qlubuntu-default-session.postrm 1970-01-01 00:00:00 +0000
220@@ -1,16 +0,0 @@
221-#!/bin/sh -e
222-
223-set -e
224-
225-case "$1" in
226- remove|purge)
227- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
228- /usr/lib/lightdm/lightdm-set-defaults --remove --session=qlubuntu || true
229- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-kde-greeter || true
230- fi
231- ;;
232-esac
233-
234-
235-#DEBHELPER#
236-exit 0

Subscribers

People subscribed via source and target branches

to all changes: