Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/clean_up_build_dependencies_cruft into lp:ubuntu-ui-toolkit/staging
Proposed by
Timo Jyrinki
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zsombor Egri | ||||
Approved revision: | 1411 | ||||
Merged at revision: | 1468 | ||||
Proposed branch: | lp:~timo-jyrinki/ubuntu-ui-toolkit/clean_up_build_dependencies_cruft | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
34 lines (+1/-3) 2 files modified
debian/control (+0/-3) debian/rules (+1/-0) |
||||
To merge this branch: | bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/clean_up_build_dependencies_cruft | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Zoltan Balogh | Approve | ||
Review via email:
|
Commit message
Clean up cruft from build dependencies.
Description of the change
Clean up cruft from build dependencies.
Having stumbled with UITK-gles build problems with Qt 5.4.0, I tested that some of the cruft from build-deps can be removed. They have had their historical reasons, being workarounds to get something working in the past, but let's see if we can live without them.
To post a comment you must log in.
FAILED: Continuous integration, rev:1410 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1434/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1320 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-amd64- ci/161 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/164 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/164/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-i386- ci/161 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1167 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1318 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1318/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18004
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1434/ rebuild
http://