xubuntu-dev team mailing list archive

[Robert Ancell <robert.ancell@xxxxxxxxxxxxx>]

Robert Ancell has proposed merging lp:~robert-ancell/xubuntu-default-settings/lightdm.conf into lp:xubuntu-default-settings.

Commit message:
Install lightdm configuration in /usr/share not /etc and give it higher priority than the ubuntu settings

Requested reviews:
  Xubuntu Developers (xubuntu-dev)
Related bugs:
  Bug #1311090 in xubuntu-default-settings (Ubuntu): "After removing xubuntu-default-settings package lightdm failed to start"
  https://bugs.launchpad.net/ubuntu/+source/xubuntu-default-settings/+bug/1311090

For more details, see:
https://code.launchpad.net/~robert-ancell/xubuntu-default-settings/lightdm.conf/+merge/216782
-- 
https://code.launchpad.net/~robert-ancell/xubuntu-default-settings/lightdm.conf/+merge/216782
Your team Xubuntu Developers is requested to review the proposed merge of lp:~robert-ancell/xubuntu-default-settings/lightdm.conf into lp:xubuntu-default-settings.

=== renamed file 'debian/10-xubuntu.conf' => 'debian/60-xubuntu.conf'
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 15:13:08 +0000
+++ debian/changelog	2014-04-22 20:59:30 +0000
@@ -1,3 +1,13 @@
+xubuntu-default-settings (14.04.5) UNRELEASED; urgency=medium
+
+  * debian/60-xubuntu.conf:
+  * debian/xubuntu-default-settings.install:
+  * debian/xubuntu-default-settings.maintscript:
+    - Install lightdm configuration in /usr/share not /etc and give it higher
+      priority than the ubuntu settings (LP: #1311090)
+
+ -- Robert Ancell <robert.ancell@xxxxxxxxxxxxx>  Wed, 23 Apr 2014 08:49:18 +1200
+
 xubuntu-default-settings (14.04.4) trusty; urgency=medium
 
   * Set default wallpaper key for gsettings based applications, e.g. such

=== modified file 'debian/xubuntu-default-settings.install'
--- debian/xubuntu-default-settings.install	2013-12-10 21:10:03 +0000
+++ debian/xubuntu-default-settings.install	2014-04-22 20:59:30 +0000
@@ -1,3 +1,3 @@
 debian/tmp/etc
 debian/tmp/usr
-debian/10-xubuntu.conf	etc/lightdm/lightdm.conf.d/
+debian/60-xubuntu.conf	usr/share/lightdm/lightdm.conf.d/

=== modified file 'debian/xubuntu-default-settings.maintscript'
--- debian/xubuntu-default-settings.maintscript	2013-03-02 18:13:33 +0000
+++ debian/xubuntu-default-settings.maintscript	2014-04-22 20:59:30 +0000
@@ -2,3 +2,4 @@
 rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/datetime-7.rc 12.10.2~
 mv_conffile /etc/xdg/xdg-xubuntu/Terminal/terminalrc /etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 13.04.0~
 rm_conffile /etc/xdg/xdg-xubuntu/Thunar/thunarrc 13.04.1~
+rm_conffile /etc/lightdm/lightdm.conf.d/10-xubuntu.conf 14.04.4