unity-scope-click

Merge lp:~thomas-voss/unity-scope-click/adjust-build-dep-on-libpay into lp:unity-scope-click

  1. adjust-build-dep-on-libpay
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 250
Merged at revision: 249
Proposed branch: lp:~thomas-voss/unity-scope-click/adjust-build-dep-on-libpay
Merge into: lp:unity-scope-click
Diff against target: 25 lines (+2/-2)
2 files modified
debian/control (+1/-1)
scope/clickstore/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~thomas-voss/unity-scope-click/adjust-build-dep-on-libpay
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+227891@code.launchpad.net

Commit message

Adjust build dependency on libpay*-dev

Description of the change

Adjust build-dependency on libpay*-dev.

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

FAILED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/498/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/38/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/498/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Colin Watson (cjwatson) wrote :

Looks fine. If you want a passing Jenkins run then I think you need to convince the relevant job to build against utopic-proposed or against silo 8; I don't know the details of that.

review: Approve
lp:~thomas-voss/unity-scope-click/adjust-build-dep-on-libpay updated
250. By Thomas Voß

Account for change to pay2.

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

FAILED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/499/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/39/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/499/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-07-22 18:00:00 +0000
3+++ debian/control 2014-07-23 12:02:08 +0000
4@@ -12,7 +12,7 @@
5 libboost-locale-dev,
6 libglib2.0-dev (>= 2.32),
7 libjsoncpp-dev,
8- libpay1-dev,
9+ libpay2-dev,
10 libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
11 libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
12 libubuntuoneauth-2.0-dev,
13
14=== modified file 'scope/clickstore/CMakeLists.txt'
15--- scope/clickstore/CMakeLists.txt 2014-07-16 21:49:11 +0000
16+++ scope/clickstore/CMakeLists.txt 2014-07-23 12:02:08 +0000
17@@ -3,7 +3,7 @@
18 find_package (Qt5Core REQUIRED)
19 find_package (Qt5Sql REQUIRED)
20 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
21-pkg_check_modules(LIBPAY REQUIRED pay-1)
22+pkg_check_modules(LIBPAY REQUIRED pay-2)
23
24 add_definitions(
25 -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"

Subscribers

People subscribed via source and target branches

to all changes: