Merge lp:~unit193/xubuntu-default-settings/session-fix into lp:~xubuntu-dev/xubuntu-default-settings/trunk

Proposed by Unit 193 on 2013-12-08
Status: Merged
Merged at revision: 455
Proposed branch: lp:~unit193/xubuntu-default-settings/session-fix
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 68 lines (+10/-23)
5 files modified
debian/10-xubuntu.conf (+2/-0)
debian/changelog (+7/-0)
debian/xubuntu-default-settings.install (+1/-0)
debian/xubuntu-default-settings.postinst (+0/-9)
debian/xubuntu-default-settings.postrm (+0/-14)
To merge this branch: bzr merge lp:~unit193/xubuntu-default-settings/session-fix
Reviewer Review Type Date Requested Status
Micah Gersten 2013-12-08 Approve on 2014-01-15
Review via email: mp+198177@code.launchpad.net
To post a comment you must log in.
455. By Unit 193 <unit193@Sigma> on 2013-12-10

Added in LP: 1259525, and missed the file we're actually installing.

456. By Unit 193 <unit193@Sigma> on 2013-12-10

Remove leading slash.

Micah Gersten (micahg) wrote :

Since this is blocking people from logging in, I'm taking this now, but someone should speak with the lightdm team and see if there's a cleanish way to clean up the config without the lightdm-set-defaults tool

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/10-xubuntu.conf'
2--- debian/10-xubuntu.conf 1970-01-01 00:00:00 +0000
3+++ debian/10-xubuntu.conf 2013-12-10 21:10:24 +0000
4@@ -0,0 +1,2 @@
5+[SeatDefaults]
6+user-session=xubuntu
7
8=== modified file 'debian/changelog'
9--- debian/changelog 2013-09-20 19:44:00 +0000
10+++ debian/changelog 2013-12-10 21:10:24 +0000
11@@ -1,3 +1,10 @@
12+xubuntu-default-settings (14.04.0) trusty; urgency=low
13+
14+ * Use /etc/lightdm.d/10-xubuntu.conf to set session, now that
15+ lightdm-set-defaults is gone. (LP: 1259525)
16+
17+ -- Unit 193 <unit193@ubuntu.com> Sun, 08 Dec 2013 13:53:27 -0500
18+
19 xubuntu-default-settings (13.10.5) saucy; urgency=low
20
21 * New wallpaper for saucy (lp: #1228098):
22
23=== modified file 'debian/xubuntu-default-settings.install'
24--- debian/xubuntu-default-settings.install 2011-11-19 19:05:13 +0000
25+++ debian/xubuntu-default-settings.install 2013-12-10 21:10:24 +0000
26@@ -1,2 +1,3 @@
27 debian/tmp/etc
28 debian/tmp/usr
29+debian/10-xubuntu.conf etc/lightdm/lightdm.conf.d/
30
31=== modified file 'debian/xubuntu-default-settings.postinst'
32--- debian/xubuntu-default-settings.postinst 2012-02-12 01:05:16 +0000
33+++ debian/xubuntu-default-settings.postinst 2013-12-10 21:10:24 +0000
34@@ -2,15 +2,6 @@
35
36 set -e
37
38-case "$1" in
39- configure|upgrade)
40- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
41- /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=xubuntu || true
42- /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
43- fi
44- ;;
45-esac
46-
47 if [ "$1" = "configure" ] ; then
48 update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \
49 lightdm-gtk-greeter-config-derivative \
50
51=== removed file 'debian/xubuntu-default-settings.postrm'
52--- debian/xubuntu-default-settings.postrm 2012-02-12 01:05:16 +0000
53+++ debian/xubuntu-default-settings.postrm 1970-01-01 00:00:00 +0000
54@@ -1,14 +0,0 @@
55-#! /bin/sh
56-
57-set -e
58-
59-case "$1" in
60- remove|purge)
61- if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
62- /usr/lib/lightdm/lightdm-set-defaults --remove --session=xubuntu || true
63- /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
64- fi
65- ;;
66-esac
67-
68-#DEBHELPER#

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: