Merge lp:~cr3/checkbox/setup_qt into lp:checkbox
Status: | Merged |
---|---|
Merged at revision: | 1777 |
Proposed branch: | lp:~cr3/checkbox/setup_qt |
Merge into: | lp:checkbox |
Diff against target: |
106 lines (+36/-28) 2 files modified
debian/changelog (+2/-1) setup.py (+34/-27) |
To merge this branch: | bzr merge lp:~cr3/checkbox/setup_qt |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Tardif (community) | Approve | ||
Zygmunt Krynicki (community) | Needs Fixing | ||
Review via email: mp+129712@code.launchpad.net |
Commit message
Made build dependency on qt4-make optional by cr3.
Description of the change
These changes prevent having other projects like hexr which only need the checkbox core to depend on building the Qt interface. The build process should not be affected for all other intents and purposes. Here is the result of testing the sbuild process:
Architecture: amd64
Build-Space: 46944
Build-Time: 148
Distribution: quantal
Install-Time: 80
Job: ../checkbox_
Package: checkbox
Package-Time: 260
Source-Version: 0.14.10
Space: 46944
Status: successful
Version: 0.14.10
───────
Finished at 20121015-1215
Build needed 00:04:20, 46944k disc space
16 - -- Daniel Manrique <email address hidden> Fri, 12 Oct 2012 10:47:26 -0400
17 + -- Marc Tardif <email address hidden> Fri, 12
I don't think we should be changing that, we'll just add more conflicts
Otherwise ok