Compiz

Merge lp://qastaging/~compiz-team/compiz/fix-1051595 into lp://qastaging/compiz/0.9.8

  1. fix-1051595
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Rejected
Rejected by: Daniel van Vugt
Proposed branch: lp://qastaging/~compiz-team/compiz/fix-1051595
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 38 lines (+5/-14)
1 file modified
cmake/base.cmake (+5/-14)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/fix-1051595
Reviewer Review Type Date Requested Status
Daniel van Vugt Needs Fixing
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+124977@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-18.

Commit message

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

Description of the change

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3378
http://jenkins.qa.ubuntu.com/job/compiz-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/83/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Try again jenkins

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3378
http://jenkins.qa.ubuntu.com/job/compiz-ci/84/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/84/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Do you think this is a problem on jenkins side? TBH I don't see anything obvious.

Revision history for this message
Martin Mrazik (mrazik) wrote :

I think this is the line which makes it fail:

dh_install: compiz-dev missing files (debian/tmp/usr/share/cmake*/FindCompiz.cmake), aborting

Revision history for this message
Martin Mrazik (mrazik) wrote :

Looks like a packaging/installing issue to me (see also the comment in debian/rules for override_dh_install). Ping me if you still think its a jenkins problem.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Ah, you're right. I wasn't looking at the right link. We'll need to fix the packaging to handle that I guess

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Not installing share/cmake-2.8/FindCompiz.cmake
will break builds of Unity which needs it for:
  find_package (Compiz REQUIRED)

Or am I missing something?

review: Needs Information
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Confirmed, this breaks Unity builds.

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Rejecting this because it needs fixing and needs to be resubmitted targeting lp:compiz

Unmerged revisions

3378. By erikjanp

Some problems with make findcompiz_install and make findcompizconfig_install
- make findcompiz_install errors since r3320
- in r3219 installs the findcompiz*.cmake-files with a normal make install,
but not in the Modules directory. This is a) wrong and b) not according to
the message that findcompiz* must be installed with make findcompiz_install.
Patch fixes this, by removing the extra file install with make install, and
cleaning up the building of the findcompiz-target.
(LP: #1051595)

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