Ubuntu Touch session manager

Merge lp:~mterry/ubuntu-touch-session/move-lightdm into lp:ubuntu-touch-session

  1. move-lightdm
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Oliver Grawert
Approved revision: 169
Merged at revision: 175
Proposed branch: lp:~mterry/ubuntu-touch-session/move-lightdm
Merge into: lp:ubuntu-touch-session
Diff against target: 32 lines (+8/-1)
3 files modified
debian/changelog (+6/-0)
debian/ubuntu-touch-session.install (+1/-1)
debian/ubuntu-touch-session.maintscript (+1/-0)
To merge this branch: bzr merge lp:~mterry/ubuntu-touch-session/move-lightdm
Reviewer Review Type Date Requested Status
Oliver Grawert Pending
Ubuntu Phablet Team Pending
Review via email: mp+211445@code.launchpad.net

Commit message

Move the LightDM config file to /usr/share instead of /etc.

Description of the change

Move the LightDM config file to /usr/share instead of /etc.

A while ago, LightDM introduced the ability to load from /usr/share/lightdm/lightdm.conf.d, instead of /etc/lightdm/lightdm.conf.d. And we've been migrating files over, since they shouldn't be conffiles and to allow easier overriding by /custom.

To post a comment you must log in.
lp:~mterry/ubuntu-touch-session/move-lightdm updated
170. By Michael Terry

Merge from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-07 14:44:52 +0000
3+++ debian/changelog 2014-05-01 14:11:29 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-touch-session (0.108) UNRELEASED; urgency=medium
6+
7+ * Move 52-ubuntu-touch.conf from /etc/lightdm to /usr/share/lightdm
8+
9+ -- Michael Terry <mterry@ubuntu.com> Mon, 17 Mar 2014 23:17:00 -0400
10+
11 ubuntu-touch-session (0.107+14.04.20140407.1-0ubuntu1) trusty; urgency=low
12
13 [ Ubuntu daily release ]
14
15=== modified file 'debian/ubuntu-touch-session.install'
16--- debian/ubuntu-touch-session.install 2014-02-13 03:39:35 +0000
17+++ debian/ubuntu-touch-session.install 2014-05-01 14:11:29 +0000
18@@ -6,5 +6,5 @@
19 upstart-session/* /usr/share/upstart/sessions/
20 ubuntu-touch-session /usr/bin/
21 ubuntu-touch.desktop /usr/share/lightdm/sessions
22-52-ubuntu-touch.conf /etc/lightdm/lightdm.conf.d
23+52-ubuntu-touch.conf /usr/share/lightdm/lightdm.conf.d
24 usc-wrapper /usr/share/ubuntu-touch-session/
25
26=== modified file 'debian/ubuntu-touch-session.maintscript'
27--- debian/ubuntu-touch-session.maintscript 2013-08-12 23:38:13 +0000
28+++ debian/ubuntu-touch-session.maintscript 2014-05-01 14:11:29 +0000
29@@ -1,2 +1,3 @@
30 rm_conffile /etc/init/ubuntu-touch-session.conf
31 rm_conffile /etc/init/ubuntu-touch-session-setup.conf
32+rm_conffile /etc/lightdm/lightdm.conf.d/52-ubuntu-touch.conf 0.108

Subscribers

People subscribed via source and target branches