Compiz

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

  1. compiz.fix_1168475
  2. Merge into 0.9.10
Proposed by Sam Spilsbury
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3681
Merged at revision: 3706
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1168475
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_1168475
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Compiz Maintainers Pending
Review via email: mp+161309@code.qastaging.launchpad.net

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-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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/compiz-ci/163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-ci/18
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-ci/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/163/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

The Jenkins failure seems unrelated here.

I am no CMake expert, but AFAICT this LGTM.

+1 for the indentation fixes and improved readability.

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

FAILED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/compiz-ci/164/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/202/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/164/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/compiz-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/165/rebuild

review: Approve (continuous-integration)

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: