unity-scopes-api

Merge lp:~michihenning/unity-scopes-api/fix-crossbuild into lp:unity-scopes-api/devel

  1. fix-crossbuild
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 685
Merged at revision: 685
Proposed branch: lp:~michihenning/unity-scopes-api/fix-crossbuild
Merge into: lp:unity-scopes-api/devel
Diff against target: 74 lines (+14/-10)
4 files modified
debian/changelog (+4/-0)
debian/control (+4/-4)
debian/control.in (+5/-5)
debian/source/format (+1/-1)
To merge this branch: bzr merge lp:~michihenning/unity-scopes-api/fix-crossbuild
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+301019@code.launchpad.net

Commit message

Fixes from Florian for building with crossbuilder (with minor adjustment: <!nocheck>).

Description of the change

Fixes from Florian for building with crossbuilder (with minor adjustment: <!nocheck>).

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:683
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/32/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/245/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/253
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/188
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/188
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/188
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/117/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/117/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/32/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:683
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/33/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/247/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/255
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/190
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/190
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/190
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/119/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/119/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/33/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:684
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/34/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/248/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/256
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/191
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/191
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/191
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/120/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/120/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

python3 should still have the :any
Other than that it looks good

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:685
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/253/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/261
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/196
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/196
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/196
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/125/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/35/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Hi Michi, could you kick a rebuild on this branch? I *think* the OnlineAccountsClient test should work now (dependancy issue).

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:685
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/572/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/578
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/405/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/405/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/405/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/405/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/405/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/405/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/42/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:685
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/45/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/577
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/583
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/409/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/409
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/409/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/45/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Awesome, looks good now

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-06-28 08:18:11 +0000
3+++ debian/changelog 2016-07-26 02:07:21 +0000
4@@ -1,5 +1,9 @@
5 unity-scopes-api (1.0.7-0ubuntu1) UNRELEASED; urgency=medium
6
7+ [ Michi Henning ]
8+ * Fixes for building with crossbuilder from Florian Boucault, with minor adjustments.
9+
10+ [ Pawel Stolowski ]
11 * Marked the push(Filters const&, FilterState const&) method of SearchReply
12 and SearchListenerBase as deprecated and provided push methods which take
13 the Filters argument only.
14
15=== modified file 'debian/control'
16--- debian/control 2016-06-17 07:27:25 +0000
17+++ debian/control 2016-07-26 02:07:21 +0000
18@@ -7,7 +7,7 @@
19 Priority: optional
20 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21 Build-Depends: abigail-tools | libabigail-tools,
22- binutils,
23+ binutils:native,
24 capnproto,
25 click-dev (>= 0.2.2),
26 cmake,
27@@ -37,9 +37,9 @@
28 lsb-release,
29 lttng-tools,
30 pkg-config,
31- python3:any,
32- python3-dbusmock,
33- python-tornado,
34+ python3:any <!nocheck>,
35+ python3-dbusmock <!nocheck>,
36+ python-tornado <!nocheck>,
37 valgrind,
38 Standards-Version: 3.9.6
39 XS-Testsuite: autopkgtest
40
41=== modified file 'debian/control.in'
42--- debian/control.in 2016-04-06 23:27:51 +0000
43+++ debian/control.in 2016-07-26 02:07:21 +0000
44@@ -1,8 +1,8 @@
45 Source: unity-scopes-api
46 Priority: optional
47 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
48-Build-Depends: abigail-tools | libabigail-tools,
49- binutils,
50+Build-Depends: abigail-tools <!nocheck> | libabigail-tools <!nocheck>,
51+ binutils:native,
52 capnproto,
53 click-dev (>= 0.2.2),
54 cmake,
55@@ -32,9 +32,9 @@
56 lsb-release,
57 lttng-tools,
58 pkg-config,
59- python3:any,
60- python3-dbusmock,
61- python-tornado,
62+ python3 <!nocheck>,
63+ python3-dbusmock <!nocheck>,
64+ python-tornado <!nocheck>,
65 valgrind,
66 Standards-Version: 3.9.6
67 XS-Testsuite: autopkgtest
68
69=== modified file 'debian/source/format'
70--- debian/source/format 2015-09-08 02:29:27 +0000
71+++ debian/source/format 2016-07-26 02:07:21 +0000
72@@ -1,1 +1,1 @@
73-3.0 (quilt)
74+3.0 (native)

Subscribers

People subscribed via source and target branches

to all changes: