Unity System Compositor

Merge lp:~timo-jyrinki/unity-system-compositor/clean_conffile into lp:unity-system-compositor

  1. clean_conffile
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 102
Merged at revision: 101
Proposed branch: lp:~timo-jyrinki/unity-system-compositor/clean_conffile
Merge into: lp:unity-system-compositor
Diff against target: 5 lines (+1/-0)
1 file modified
debian/unity-system-compositor.maintscript (+1/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/unity-system-compositor/clean_conffile
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Unity System Compositor Development Team Pending
Review via email: mp+195934@code.launchpad.net

Commit message

Clean the moved conffile when upgrading from previous version. (LP: #1253008)

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

When upgrading from exactly previous version, the configuration file is removed. When installing ubuntu-desktop-mir at the same time, the configuration file from the new package stays in place, and also if the new unity-system-compositor is reinstalled.

lp:~timo-jyrinki/unity-system-compositor/clean_conffile updated
102. By Timo Jyrinki

Use a .maintscript instead

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/16

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

review: Approve (continuous-integration)
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! LGTM.

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Same results with the .maintscript + rm_conffile usage.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/unity-system-compositor.maintscript'
2--- debian/unity-system-compositor.maintscript 1970-01-01 00:00:00 +0000
3+++ debian/unity-system-compositor.maintscript 2013-11-20 10:47:35 +0000
4@@ -0,0 +1,1 @@
5+rm_conffile /etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf 0.0.1+14.04.20131028.1-0ubuntu1 unity-system-compositor

Subscribers

People subscribed via source and target branches