Xubuntu Default Settings

Merge lp:~robert-ancell/xubuntu-default-settings/lightdm.conf into lp:~xubuntu-dev/xubuntu-default-settings/trunk

  1. lightdm.conf
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merge reported by: Simon Steinbeiß
Merged at revision: not available
Proposed branch: lp:~robert-ancell/xubuntu-default-settings/lightdm.conf
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 36 lines (+12/-1)
3 files modified
debian/changelog (+10/-0)
debian/xubuntu-default-settings.install (+1/-1)
debian/xubuntu-default-settings.maintscript (+1/-0)
To merge this branch: bzr merge lp:~robert-ancell/xubuntu-default-settings/lightdm.conf
Reviewer Review Type Date Requested Status
Simon Steinbeiß Approve
Pasi Lallinaho (community) community Approve
Review via email: mp+216782@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

This matches the recommended changes that were made to other packages that install lightdm configuration.

Revision history for this message
Pasi Lallinaho (knome) wrote :

Sounds sane to me.

review: Approve (community)
Revision history for this message
Simon Steinbeiß (ochosi) wrote :

Great, thanks for the patch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'debian/10-xubuntu.conf' => 'debian/60-xubuntu.conf'
2=== modified file 'debian/changelog'
3--- debian/changelog 2014-04-09 15:13:08 +0000
4+++ debian/changelog 2014-04-22 20:59:30 +0000
5@@ -1,3 +1,13 @@
6+xubuntu-default-settings (14.04.5) UNRELEASED; urgency=medium
7+
8+ * debian/60-xubuntu.conf:
9+ * debian/xubuntu-default-settings.install:
10+ * debian/xubuntu-default-settings.maintscript:
11+ - Install lightdm configuration in /usr/share not /etc and give it higher
12+ priority than the ubuntu settings (LP: #1311090)
13+
14+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 23 Apr 2014 08:49:18 +1200
15+
16 xubuntu-default-settings (14.04.4) trusty; urgency=medium
17
18 * Set default wallpaper key for gsettings based applications, e.g. such
19
20=== modified file 'debian/xubuntu-default-settings.install'
21--- debian/xubuntu-default-settings.install 2013-12-10 21:10:03 +0000
22+++ debian/xubuntu-default-settings.install 2014-04-22 20:59:30 +0000
23@@ -1,3 +1,3 @@
24 debian/tmp/etc
25 debian/tmp/usr
26-debian/10-xubuntu.conf etc/lightdm/lightdm.conf.d/
27+debian/60-xubuntu.conf usr/share/lightdm/lightdm.conf.d/
28
29=== modified file 'debian/xubuntu-default-settings.maintscript'
30--- debian/xubuntu-default-settings.maintscript 2013-03-02 18:13:33 +0000
31+++ debian/xubuntu-default-settings.maintscript 2014-04-22 20:59:30 +0000
32@@ -2,3 +2,4 @@
33 rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/datetime-7.rc 12.10.2~
34 mv_conffile /etc/xdg/xdg-xubuntu/Terminal/terminalrc /etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 13.04.0~
35 rm_conffile /etc/xdg/xdg-xubuntu/Thunar/thunarrc 13.04.1~
36+rm_conffile /etc/lightdm/lightdm.conf.d/10-xubuntu.conf 14.04.4

Subscribers

People subscribed via source and target branches

to status/vote changes: