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

[Michał Sawicz]

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

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Michi Henning (michihenning)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Michi Henning (michihenning)]

Merging this branch should fix the build failure:

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

[Paweł Stołowski (stolowski)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
 Source: unity-scopes-api
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: g++-4.9,
-               debhelper (>= 9),
+Build-Depends: capnproto,
                click-dev (>= 0.2.2),
                cmake,
+               dbus-test-runner,
+               debhelper (>= 9),
                doxygen,
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version. To allow cross-compiling to work, we also must
+# append :native to g++-4.9 so we don't try to run armhf g++
+# on an x86 CPU for example, when cross-compiling.
+               g++-4.9:native,
                google-mock,
                graphviz,
-               pkg-config,
-               python3:any,
-               capnproto,
+               libaccounts-glib-dev,
                libapparmor-dev,
-               libprocess-cpp-dev (>= 1.0.1),
-               libunity-api-dev (>= 7.80.7~),
                libboost-filesystem-dev,
+               libboost-log-dev,
                libboost-regex-dev,
                libboost-serialization-dev,
-               libboost-log-dev,
                libcapnp-dev (>= 0.4.0),
+               libdbustest1-dev,
+               libjsoncpp-dev,
+               liblttng-ust-dev,
+               libprocess-cpp-dev (>= 1.0.1),
+               libsignon-glib-dev,
+               libunity-api-dev (>= 7.80.7~),
                libzmq3-dev,
                libzmqpp-dev,
-               liblttng-ust-dev,
                lttng-tools,
+               pkg-config,
+               python3:any,
                qtbase5-dev,
-               libjsoncpp-dev,
-               libaccounts-glib-dev,
-               libsignon-glib-dev,
-               dbus-test-runner,
-               libdbustest1-dev,
                valgrind,
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
@@ -45,7 +50,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Replaces: libunity-scopes0,
           libunity-scopes1,
           libunity-scopes2,
@@ -60,9 +65,9 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libunity-scopes3 (= ${binary:Version}),
-         libproperties-cpp-dev,
+Depends: libproperties-cpp-dev,
          libunity-api-dev,
+         libunity-scopes3 (= ${binary:Version}),
          ${misc:Depends},
 Description: Header files for Unity scopes API
  Library to integrate scopes with the Unity shell (dev files)
@@ -73,8 +78,8 @@
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends},
 Depends: libunity-scopes3 (= ${binary:Version}),
+         ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
 Description: Client utility for Unity scopes API
  Commandline client utility for querying Unity scopes, useful for testing.