Merge lp:~robert-ancell/unity-system-compositor/usc-config-usr-share into lp:unity-system-compositor

Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 109
Merged at revision: 118
Proposed branch: lp:~robert-ancell/unity-system-compositor/usc-config-usr-share
Merge into: lp:unity-system-compositor
Diff against target: 12 lines (+2/-1)
2 files modified
debian/ubuntu-desktop-mir.install (+1/-1)
debian/ubuntu-desktop-mir.maintscript (+1/-0)
To merge this branch: bzr merge lp:~robert-ancell/unity-system-compositor/usc-config-usr-share
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+200610@code.launchpad.net

Commit message

Install LightDM configuration into /usr/share so it's not kept around by dpkg

Description of the change

Move LightDM configuration from /etc to /usr/share.

We are moving all package provided configuration into /usr/share so dpkg doesn't keep them around after a package has been uninstalled and users aren't likely to modify them. You can always override this configuration by putting your own configuration into /etc.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:108
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robert-ancell/unity-system-compositor/usc-config-usr-share/+merge/200610/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/71/rebuild

review: Needs Fixing (continuous-integration)
109. By Robert Ancell

Commit to wakeup Jenkins. WAKE UP!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I'm not really familiar with this stuff, but can't see anything wrong.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-desktop-mir.install'
2--- debian/ubuntu-desktop-mir.install 2013-11-12 15:45:22 +0000
3+++ debian/ubuntu-desktop-mir.install 2014-01-07 01:28:36 +0000
4@@ -1,1 +1,1 @@
5-debian/10-unity-system-compositor.conf /etc/lightdm/lightdm.conf.d
6+debian/10-unity-system-compositor.conf /usr/share/lightdm/lightdm.conf.d
7
8=== added file 'debian/ubuntu-desktop-mir.maintscript'
9--- debian/ubuntu-desktop-mir.maintscript 1970-01-01 00:00:00 +0000
10+++ debian/ubuntu-desktop-mir.maintscript 2014-01-07 01:28:36 +0000
11@@ -0,0 +1,1 @@
12+rm_conffile /etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf 0.0.2+14.04.20131128.2-0ubuntu1

Subscribers

People subscribed via source and target branches