Merge lp:~fboucault/unity-scopes-api/crossbuild_fixes into lp:unity-scopes-api

[Florian Boucault]

Crossbuilding fixes

Crossbuilding fixes

[Michi Henning (michihenning)]

I've pushed a slightly modified MR for this here: https://code.launchpad.net/~michihenning/unity-scopes-api/fix-crossbuild/+merge/301019

That version uses the <!nocheck> in debian/control.

Could you please check and comment, and withdraw this MR once you are OK with the one?

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-06-17 07:27:25 +0000
+++ debian/control	2016-07-19 15:30:41 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: abigail-tools | libabigail-tools,
-               binutils,
+               binutils:native,
                capnproto,
                click-dev (>= 0.2.2),
                cmake,
@@ -39,7 +39,7 @@
                pkg-config,
                python3:any,
                python3-dbusmock,
-               python-tornado,
+               python-tornado:native,
                valgrind,
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest

=== modified file 'debian/control.in'
--- debian/control.in	2016-04-06 23:27:51 +0000
+++ debian/control.in	2016-07-19 15:30:41 +0000
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: abigail-tools | libabigail-tools,
-               binutils,
+               binutils:native,
                capnproto,
                click-dev (>= 0.2.2),
                cmake,
@@ -34,7 +34,7 @@
                pkg-config,
                python3:any,
                python3-dbusmock,
-               python-tornado,
+               python-tornado:native,
                valgrind,
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest

=== modified file 'debian/source/format'
--- debian/source/format	2015-09-08 02:29:27 +0000
+++ debian/source/format	2016-07-19 15:30:41 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)