Merge lp:~roadmr/checkbox/packaging-ubuntu-sdk-build-depends-fix into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~roadmr/checkbox/packaging-ubuntu-sdk-build-depends-fix
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 47 lines (+25/-2)
1 file modified
debian/control (+25/-2)
To merge this branch: bzr merge lp:~roadmr/checkbox/packaging-ubuntu-sdk-build-depends-fix
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Needs Information
Daniel Manrique (community) Approve
Review via email: mp+199047@code.launchpad.net

Commit message

This implements Brendan's idea about removing ubuntu-sdk as a build-depends, and instead spelling out the packages it pulls. In the process I removed some unneeded packages such as qmlscene, documentation, examples, qtcreator and qtcreator plugins (since it's just for command-line building, those tools aren't needed).

Description of the change

This implements Brendan's idea about removing ubuntu-sdk as a build-depends, and instead spelling out the packages it pulls. In the process I removed some unneeded packages such as qmlscene, documentation, examples, qtcreator and qtcreator plugins (since it's just for command-line building, those tools aren't needed).

I tested it in a local sbuild using precise and saucy (to test the LTS and latest stable release), and it was able to build packages correctly.

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

I'll self-approve this based on my local testing results, to see if I can unblock builds (hey, it's not building anyway so I can't really break it more). Still, please review for sanity.

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Looks good, I'd +1 it as well. I have a few questions though:

+ cordova-ubuntu-2.8,
+ cordova-ubuntu-2.8-dev,

Why do we build depend on that? We're certainly *not* using cordova.

+Build-Depends: click,
+ click-dev,

As above

43 + ubuntu-html5-theme,

As above

review: Needs Information
Revision history for this message
Daniel Manrique (roadmr) wrote :

Hi! Removed the above as well as ubuntu-ui-toolkit-theme, and the build still succeeds so I'll propose a merge with those changes. Thanks!

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 2013-12-13 14:26:50 +0000
3+++ debian/control 2013-12-15 17:55:55 +0000
4@@ -5,9 +5,19 @@
5 Standards-Version: 3.9.3
6 X-Python3-Version: >= 3.2
7 XS-Testsuite: autopkgtest
8-Build-Depends: debhelper (>= 9.2),
9+Build-Depends: click,
10+ click-dev,
11+ cordova-ubuntu-2.8,
12+ cordova-ubuntu-2.8-dev,
13+ debhelper (>= 9.2),
14 dh-translations,
15 libqt4-dev,
16+ libqt5qml-graphicaleffects,
17+ libqt5sql5-sqlite,
18+ libqt5svg5-dev,
19+ libqt5v8-5-dev,
20+ libqt5webkit5-dev,
21+ libqt5xmlpatterns5-dev,
22 po-debconf,
23 python,
24 python-distutils-extra,
25@@ -21,8 +31,21 @@
26 python3-requests ( >= 1.0),
27 python3-setuptools,
28 python3-sphinx,
29+ qt3d5-dev,
30 qt4-qmake,
31- ubuntu-sdk
32+ qt5-default,
33+ qtbase5-dev,
34+ qtdeclarative5-cordova-2.8-plugin,
35+ qtdeclarative5-dev,
36+ qtdeclarative5-dev-tools,
37+ qtlocation5-dev,
38+ qtmultimedia5-dev,
39+ qtscript5-dev,
40+ qtsensors5-dev,
41+ qttools5-dev,
42+ qttools5-dev-tools,
43+ ubuntu-html5-theme,
44+ ubuntu-ui-toolkit-theme
45 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
46
47 Package: python3-plainbox-doc

Subscribers

People subscribed via source and target branches