Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/clean_up_build_dependencies_cruft into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki on 2015-02-12
Status: Merged
Approved by: Zsombor Egri on 2015-04-08
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
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-04-08
Zoltan Balogh (community) 2015-02-12 Approve on 2015-04-08
Review via email: mp+249461@code.launchpad.net

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.
Timo Jyrinki (timo-jyrinki) wrote :

qtpim5-dev directly depends on libqt5organizer5, qtbase5-dev depends on qtbase5-dev-tools and libqt5sql5 Recommends libqt5sql5-sqlite which gets it installed

Zoltan Balogh (bzoltan) wrote :

Good stuff!

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-02-25 14:25:59 +0000
3+++ debian/control 2015-03-03 09:12:17 +0000
4@@ -9,11 +9,9 @@
5 python3:any,
6 python:any,
7 qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
8- qt5-default,
9 qtbase5-dev,
10 qtbase5-private-dev,
11 qttools5-dev-tools,
12- qtbase5-dev-tools,
13 libqt5sql5-sqlite,
14 qtdeclarative5-dev-tools,
15 qtdeclarative5-private-dev,
16@@ -33,7 +31,6 @@
17 qtmultimedia5-doc-html,
18 unity-action-doc,
19 devscripts,
20- libqt5organizer5,
21 qtpim5-dev,
22 language-pack-en-base,
23 libdbus-1-dev,
24
25=== modified file 'debian/rules'
26--- debian/rules 2015-01-23 18:11:22 +0000
27+++ debian/rules 2015-03-03 09:12:17 +0000
28@@ -4,6 +4,7 @@
29 # export DH_VERBOSE=1
30 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
31 export QMAKEFEATURES=$(CURDIR)/features
32+export QT_SELECT := qt5
33 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
34 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
35

Subscribers

People subscribed via source and target branches