Merge lp:~robert-ancell/ubuntustudio-default-settings/lightdm-config-in-usr into lp:~ubuntustudio-dev/ubuntustudio-default-settings/devel

[Robert Ancell]

Move LightDM configuration from /etc/lightdm/lightdm.conf.d to
/usr/share/lightdm/lightdm.conf.d. Bump priority from 10 to 60.

Move LightDM configuration from /etc to /usr. This means it will be correctly removed if this package is uninstalled. Otherwise you can have invalid configuration (referring to a session that is not available).

This also stops people from editing this file (they should make their own snippet or edit /etc/lightdm/lightdm.conf if they want other changes).

[Robert Ancell (robert-ancell)]

You might also want to consider if the priority of this configuration is correct. Currently it will override the default Ubuntu configuration because config in /etc overrides config from /usr.

If you want to override the Ubuntu session we should change it to 60-ubuntustudio.conf.

[lp:~robert-ancell/ubuntustudio-default-settings/lightdm-config-in-usr]

259. By Robert Ancell on 2014-09-02

Change config priority from 10 to 60

260. By Robert Ancell on 2015-08-07

Use [Seat:*] section for LightDM configuration instead of deprecated [SeatDefaults]

[Set Hallstrom (sakrecoer)]

Hi Robert!
Sorry to get back to you so late. We have finally taken the steps to act upon your merge request. It seems one of the commits (260) got in there from somewhere else, so we adapted as well as we could for you to get the proper credits. Sorry if my terminology isn't the best here, I am learning bzr with the help of zequence and krytarik and this was a great merge exercise!
Thank you for taking the time to do this and sorry again for the delay.

[Set Hallstrom (sakrecoer)]

Reviewed the merge request with the help of krytarik

review: Approve (assisted review)

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 16:25:01 +0000
+++ debian/changelog	2015-08-07 01:42:51 +0000
@@ -1,3 +1,10 @@
+ubuntustudio-default-settings (0.55) utopic; urgency=medium
+
+  * Move LightDM configuration from /etc/lightdm/lightdm.conf.d to
+    /usr/share/lightdm/lightdm.conf.d
+
+ -- Robert Ancell <[e-mail]>  Wed, 03 Sep 2014 09:05:41 +1200
+
 ubuntustudio-default-settings (0.54) trusty; urgency=medium
 
   * Set default wallpaper key for gsettings based applications, e.g.

=== modified file 'debian/ubuntustudio-default-settings.maintscript'
--- debian/ubuntustudio-default-settings.maintscript	2013-10-22 18:39:29 +0000
+++ debian/ubuntustudio-default-settings.maintscript	2015-08-07 01:42:51 +0000
@@ -1,1 +1,2 @@
 rm_conffile /etc/default/grub.d/50_ubuntustudio.cfg 0.50~
+rm_conffile /etc/lightdm/lightdm.conf.d/10-ubuntustudio.conf 0.55~

=== removed directory 'etc/lightdm'
=== removed directory 'etc/lightdm/lightdm.conf.d'
=== added directory 'usr/share/lightdm'
=== added directory 'usr/share/lightdm/lightdm.conf.d'
=== renamed file 'etc/lightdm/lightdm.conf.d/10-ubuntustudio.conf' => 'usr/share/lightdm/lightdm.conf.d/60-ubuntustudio.conf'
--- etc/lightdm/lightdm.conf.d/10-ubuntustudio.conf	2014-01-09 13:40:33 +0000
+++ usr/share/lightdm/lightdm.conf.d/60-ubuntustudio.conf	2015-08-07 01:42:51 +0000
@@ -1,2 +1,2 @@
-[SeatDefaults]
+[Seat:*]
 user-session=ubuntustudio