Merge lp:~jamesh/unity-api/remove-boost-dep into lp:unity-api

Proposed by James Henstridge
Status: Merged
Approved by: Michi Henning
Approved revision: 241
Merged at revision: 244
Proposed branch: lp:~jamesh/unity-api/remove-boost-dep
Merge into: lp:unity-api
Diff against target: 34 lines (+1/-5)
2 files modified
CMakeLists.txt (+0/-1)
debian/control (+1/-4)
To merge this branch: bzr merge lp:~jamesh/unity-api/remove-boost-dep
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+301737@code.launchpad.net

Commit message

Remove unnecessary Boost dependency from package.

Description of the change

Remove unnecessary Boost dependency from package: while the CMakeLists.txt checks for Boost regex, I can see no source or header files including a Boost header.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:241
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/93/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2432
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2460
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2347
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2347
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2347
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2340/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2340
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2340/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/93/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good to me.

review: Approve
Revision history for this message
Michi Henning (michihenning) wrote :

Thanks for that! A zero-warning build policy would be good, as would be adding -Werror for release builds.

review: Approve
Revision history for this message
James Henstridge (jamesh) wrote :

Backed out second revision, because the fix was included in the latest unity-api landing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-03-14 08:12:08 +0000
3+++ CMakeLists.txt 2016-08-05 04:04:23 +0000
4@@ -79,7 +79,6 @@
5
6
7 include(FindPkgConfig)
8-find_package(Boost 1.49.0 COMPONENTS regex REQUIRED)
9 pkg_check_modules(GLIB glib-2.0 REQUIRED)
10
11 # Standard install paths
12
13=== modified file 'debian/control'
14--- debian/control 2015-11-18 12:30:41 +0000
15+++ debian/control 2016-08-05 04:04:23 +0000
16@@ -12,8 +12,6 @@
17 # on an x86 CPU for example, when cross-compiling.
18 g++:native,
19 graphviz,
20- libboost-dev (>= 1.49),
21- libboost-regex-dev (>= 1.49),
22 libglib2.0-dev,
23 libgtest-dev,
24 pkg-config,
25@@ -45,8 +43,7 @@
26 Section: libdevel
27 Architecture: any
28 Multi-Arch: same
29-Depends: libboost-dev (>= 1.49),
30- libunity-api0 (= ${binary:Version}),
31+Depends: libunity-api0 (= ${binary:Version}),
32 ${misc:Depends},
33 Description: Header files for Unity API
34 Library to integrate with the Unity shell (dev files)

Subscribers

People subscribed via source and target branches

to all changes: