Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1184755 into lp://qastaging/compiz/0.9.10

Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1184755
Merge into: lp://qastaging/compiz/0.9.10
Diff against target: 79 lines (+31/-13)
2 files modified
cmake/CompizGSettings.cmake (+10/-1)
compizconfig/ccsm/setup.py (+21/-12)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1184755
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+161308@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-04-28.

Commit message

Fix some files not installing:

 1. gsettings schemas never get added to the install_manifest list
    because we use install (CODE) so we need to add a custom
    uninstall target for those, and also need to recompile on uninstall
    too
 2. Run the gtk-update-icon-cache stage during install for ccsm and
    also add icon-theme.cache to the uninstall target

(LP: #1168475)

Description of the change

Fix some files not installing:

 1. gsettings schemas never get added to the install_manifest list
    because we use install (CODE) so we need to add a custom
    uninstall target for those, and also need to recompile on uninstall
    too
 2. Run the gtk-update-icon-cache stage during install for ccsm and
    also add icon-theme.cache to the uninstall target

(LP: #1168475)

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: