Merge lp:~fboucault/unity-scope-click/crossbuild_fixes into lp:unity-scope-click

Proposed by Florian Boucault
Status: Needs review
Proposed branch: lp:~fboucault/unity-scope-click/crossbuild_fixes
Merge into: lp:unity-scope-click
Diff against target: 49 lines (+11/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~fboucault/unity-scope-click/crossbuild_fixes
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
dobey (community) Needs Fixing
Review via email: mp+300471@code.launchpad.net

Commit message

Crossbuilding fixes

Description of the change

Crossbuilding fixes

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

That debian/changelog change should be dropped (changelog is generated by silo builds), and needs a better commit message than "fixes." Maybe something like "use new dpkg cross building feature" or similar (whatever the change actually means).

review: Needs Fixing
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:470
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/71/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/217/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/225
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/170
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/170
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/170
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/99/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/99
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/99/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/71/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

470. By Florian Boucault

Crossbuilding fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-07-05 17:01:23 +0000
3+++ debian/changelog 2016-07-19 14:38:25 +0000
4@@ -1,3 +1,9 @@
5+unity-scope-click (0.1.1+16.10.20160705-0ubuntu1local~1468938774) UNRELEASED; urgency=medium
6+
7+ * ''
8+
9+ -- Florian <kaleo@tequila> Tue, 19 Jul 2016 16:32:55 +0200
10+
11 unity-scope-click (0.1.1+16.10.20160705-0ubuntu1) yakkety; urgency=medium
12
13 * Use EXPECT_{FALSE,TRUE} instead of EXPECT_EQ for boolean reults.
14
15=== modified file 'debian/control'
16--- debian/control 2016-05-25 16:17:00 +0000
17+++ debian/control 2016-07-19 14:38:25 +0000
18@@ -1,7 +1,7 @@
19 Source: unity-scope-click
20 Section: x11
21 Priority: optional
22-Build-Depends: click,
23+Build-Depends: click:native,
24 cmake (>= 2.8.10),
25 cmake-extras,
26 dbus-x11,
27@@ -25,7 +25,7 @@
28 pkg-config,
29 python3-all:native,
30 python3-fixtures,
31- python3-scope-harness,
32+ python3-scope-harness <!cross>,
33 python3-testtools,
34 xvfb,
35 ubuntu-download-manager,
36
37=== modified file 'debian/rules'
38--- debian/rules 2015-08-06 21:25:34 +0000
39+++ debian/rules 2016-07-19 14:38:25 +0000
40@@ -12,6 +12,9 @@
41 export U1_DEBUG=1
42
43 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
44+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
45+export DEB_BUILD_PROFILES := cross
46+endif
47
48 %:
49 dh $@ --parallel --buildsystem cmake --with translations --fail-missing

Subscribers

People subscribed via source and target branches