Merge lp:~compiz-team/compiz/compiz.fix_1168475 into lp:compiz/0.9.10
Status: | Merged |
---|---|
Approved by: | Sam Spilsbury |
Approved revision: | 3681 |
Merged at revision: | 3706 |
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1168475 |
Merge into: | lp: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:~compiz-team/compiz/compiz.fix_1168475 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
MC Return | Approve | ||
Compiz Maintainers | Pending | ||
Review via email:
|
This proposal supersedes 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-
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-
also add icon-theme.cache to the uninstall target
(LP: #1168475)
FAILED: Continuous integration, rev:3681 jenkins. qa.ubuntu. com/job/ compiz- ci/163/ jenkins. qa.ubuntu. com/job/ compiz- gles-ci/ ./build= pbuilder, distribution= raring, flavor= amd64/201 jenkins. qa.ubuntu. com/job/ compiz- raring- amd64-ci/ 18 jenkins. qa.ubuntu. com/job/ compiz- raring- armhf-ci/ 18/console jenkins. qa.ubuntu. com/job/ compiz- raring- i386-ci/ 18
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ compiz- ci/163/ rebuild
http://