Unity 8

Merge lp:~unity-team/unity8/fix-application-dep into lp:unity8

  1. fix-application-dep
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1998
Merged at revision: 2005
Proposed branch: lp:~unity-team/unity8/fix-application-dep
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity8/fix-application-dep
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Abstain
Lukáš Tinkl (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+273370@code.launchpad.net

Commit message

Fix application API dependency

We need it to be equal, because we have no other way to encode backwards incompatibility

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1998
http://jenkins.qa.ubuntu.com/job/unity8-ci/6416/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4491
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/656
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23933
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/795
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/795/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23932

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6416/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM (my bad for introducing it as a convenience, somehow I expected the unity-api to keep backwards compatibility)

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Has lots of bad branches

review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote :

Actally since it's unity-team owned i cleaned them up myself

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-09-30 16:49:52 +0000
3+++ CMakeLists.txt 2015-10-05 07:12:21 +0000
4@@ -57,7 +57,7 @@
5 find_package(Qt5Concurrent 5.2 REQUIRED)
6 find_package(Qt5Sql 5.2 REQUIRED)
7
8-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
9+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
10
11 # Standard install paths
12 include(GNUInstallDirs)

Subscribers

People subscribed via source and target branches