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

Proposed by Michał Sawicz on 2015-01-16
Status: Merged
Approved by: Paweł Stołowski on 2015-01-19
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 2015-01-16 Approve on 2015-01-20
Paweł Stołowski 2015-01-16 Approve on 2015-01-19
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.
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!

Michi Henning (michihenning) wrote :

Merging this branch should fix the build failure:

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

Paweł Stołowski (stolowski) wrote :

+1

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

Subscribers

People subscribed via source and target branches

to all changes: