unity-scopes-api

Merge lp:~saviq/unity-scopes-api/fix-cross-wrap into lp:unity-scopes-api

  1. fix-cross-wrap
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 559
Merged at revision: 281
Proposed branch: lp:~saviq/unity-scopes-api/fix-cross-wrap
Merge into: lp:unity-scopes-api
Diff against target: 87 lines (+23/-18)
1 file modified
debian/control (+23/-18)
To merge this branch: bzr merge lp:~saviq/unity-scopes-api/fix-cross-wrap
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+246679@code.launchpad.net

This proposal supersedes a proposal from 2015-01-16.

Commit message

Depend on :native version of g++ to allow cross-compiling to work. Also run `wrap-and-sort -at`

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

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1374/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/84/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1374/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1375/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/85/console
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/85/console
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/85/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1375/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote : Posted in a previous version of this proposal

You need to target this to trunk. devel is defunct now. Sorry for that!

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

FAILED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/522/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/522/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Merging this branch should fix the build failure:

lp:~marcustomlinson/unity-scopes-api/lp-1410125

Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

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

PASSED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/530/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/55

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/530/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-11-18 07:04:04 +0000
+++ debian/control 2015-01-16 08:56:48 +0000
@@ -1,34 +1,39 @@
1Source: unity-scopes-api1Source: unity-scopes-api
2Priority: optional2Priority: optional
3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4Build-Depends: g++-4.9,4Build-Depends: capnproto,
5 debhelper (>= 9),
6 click-dev (>= 0.2.2),5 click-dev (>= 0.2.2),
7 cmake,6 cmake,
7 dbus-test-runner,
8 debhelper (>= 9),
8 doxygen,9 doxygen,
10# We rely on C++11 features, and to prevent from ABI breaks
11# in libstdc++ causing us issues, we explicitly select a G++
12# version. To allow cross-compiling to work, we also must
13# append :native to g++-4.9 so we don't try to run armhf g++
14# on an x86 CPU for example, when cross-compiling.
15 g++-4.9:native,
9 google-mock,16 google-mock,
10 graphviz,17 graphviz,
11 pkg-config,18 libaccounts-glib-dev,
12 python3:any,
13 capnproto,
14 libapparmor-dev,19 libapparmor-dev,
15 libprocess-cpp-dev (>= 1.0.1),
16 libunity-api-dev (>= 7.80.7~),
17 libboost-filesystem-dev,20 libboost-filesystem-dev,
21 libboost-log-dev,
18 libboost-regex-dev,22 libboost-regex-dev,
19 libboost-serialization-dev,23 libboost-serialization-dev,
20 libboost-log-dev,
21 libcapnp-dev (>= 0.4.0),24 libcapnp-dev (>= 0.4.0),
25 libdbustest1-dev,
26 libjsoncpp-dev,
27 liblttng-ust-dev,
28 libprocess-cpp-dev (>= 1.0.1),
29 libsignon-glib-dev,
30 libunity-api-dev (>= 7.80.7~),
22 libzmq3-dev,31 libzmq3-dev,
23 libzmqpp-dev,32 libzmqpp-dev,
24 liblttng-ust-dev,
25 lttng-tools,33 lttng-tools,
34 pkg-config,
35 python3:any,
26 qtbase5-dev,36 qtbase5-dev,
27 libjsoncpp-dev,
28 libaccounts-glib-dev,
29 libsignon-glib-dev,
30 dbus-test-runner,
31 libdbustest1-dev,
32 valgrind,37 valgrind,
33Standards-Version: 3.9.538Standards-Version: 3.9.5
34XS-Testsuite: autopkgtest39XS-Testsuite: autopkgtest
@@ -45,7 +50,7 @@
45Multi-Arch: same50Multi-Arch: same
46Pre-Depends: ${misc:Pre-Depends},51Pre-Depends: ${misc:Pre-Depends},
47Depends: ${misc:Depends},52Depends: ${misc:Depends},
48 ${shlibs:Depends}53 ${shlibs:Depends},
49Replaces: libunity-scopes0,54Replaces: libunity-scopes0,
50 libunity-scopes1,55 libunity-scopes1,
51 libunity-scopes2,56 libunity-scopes2,
@@ -60,9 +65,9 @@
60Architecture: any65Architecture: any
61Multi-Arch: same66Multi-Arch: same
62Pre-Depends: ${misc:Pre-Depends},67Pre-Depends: ${misc:Pre-Depends},
63Depends: libunity-scopes3 (= ${binary:Version}),68Depends: libproperties-cpp-dev,
64 libproperties-cpp-dev,
65 libunity-api-dev,69 libunity-api-dev,
70 libunity-scopes3 (= ${binary:Version}),
66 ${misc:Depends},71 ${misc:Depends},
67Description: Header files for Unity scopes API72Description: Header files for Unity scopes API
68 Library to integrate scopes with the Unity shell (dev files)73 Library to integrate scopes with the Unity shell (dev files)
@@ -73,8 +78,8 @@
73Multi-Arch: foreign78Multi-Arch: foreign
74Pre-Depends: ${misc:Pre-Depends},79Pre-Depends: ${misc:Pre-Depends},
75Depends: libunity-scopes3 (= ${binary:Version}),80Depends: libunity-scopes3 (= ${binary:Version}),
81 ${misc:Depends},
76 ${shlibs:Depends},82 ${shlibs:Depends},
77 ${misc:Depends},
78Description: Client utility for Unity scopes API83Description: Client utility for Unity scopes API
79 Commandline client utility for querying Unity scopes, useful for testing.84 Commandline client utility for querying Unity scopes, useful for testing.
8085

Subscribers

People subscribed via source and target branches

to all changes: