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

[Michał Sawicz]

Fix cross-building and clean CMakeLists of unused apparmor references.

[Michal Hruby (mhr3)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/479/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/31/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/187/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-autolanding/11/console

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

> The following packages have unmet dependencies:
> pbuilder-satisfydepends-dummy : Depends: apparmor:native which is a virtual package.
                                 Depends: python3:native which is a virtual package.
> Unable to resolve dependencies! Giving up...

I'm out of my depth here. Any suggestions for fixing this?

[Michał Sawicz (saviq)]

Yeah, sorry, should have written before - we need to contact the CI folk to check out why :native isn't supported. It might be old pbuilder or so.

I'll keep you posted.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/517/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/69

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-02 13:26:56 +0000
+++ CMakeLists.txt	2014-05-08 09:56:13 +0000
@@ -100,7 +100,7 @@
 endif()
 set(CAPNPC_FLAGS "" CACHE STRING "Extra flags for capnpc.")
 
-set(OTHER_INCLUDE_DIRS ${OTHER_INCLUDE_DIRS} ${UNITY_API_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS} ${PROCESS_CPP_INCLUDE_DIRS} ${APPARMOR_INCLUDE_DIRS})
+set(OTHER_INCLUDE_DIRS ${OTHER_INCLUDE_DIRS} ${UNITY_API_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS} ${PROCESS_CPP_INCLUDE_DIRS})
 set(OTHER_LIBS ${UNITY_API_LDFLAGS} ${OTHER_LIBS})
 
 # Standard install paths
@@ -218,7 +218,6 @@
     ${Boost_LIBRARIES}
     ${JSONCPP_LDFLAGS}
     ${PROCESS_CPP_LDFLAGS}
-    ${APPARMOR_LDFLAGS}
     ${ZMQPPLIB}
     ${ZMQLIB}
     ${CAPNPLIB}
 
=== modified file 'debian/control'
--- debian/control	2014-04-28 17:05:32 +0000
+++ debian/control	2014-05-08 09:56:13 +0000
@@ -2,14 +2,14 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
-               apparmor,
+               apparmor:native,
                click-dev (>= 0.2.2),
                cmake,
                doxygen,
                google-mock,
                graphviz,
                pkg-config,
-               python3,
+               python3:native,
                capnproto,
                libprocess-cpp-dev (>= 1.0.0),
                libunity-api-dev (>= 7.80.7~),