Merge lp:~roadmr/checkbox/packaging-control-tweaks into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Daniel Manrique on 2014-02-12
Status: Merged
Approved by: Zygmunt Krynicki on 2014-02-12
Approved revision: 62
Merged at revision: 62
Proposed branch: lp:~roadmr/checkbox/packaging-control-tweaks
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 41 lines (+4/-4)
2 files modified
debian/changelog (+3/-0)
debian/control (+1/-4)
To merge this branch: bzr merge lp:~roadmr/checkbox/packaging-control-tweaks
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2014-02-12 Approve on 2014-02-12
Review via email: mp+206041@code.launchpad.net

Commit message

Removed build dependencies on qt{multimedia,sensors}5-dev as they're not actually needed, Minor rearranging of checkbox-gui dependencies.

Description of the change

  * Removed build dependencies on qt{multimedia,sensors}5-dev as they're not
    actually needed.
  * Minor rearranging of checkbox-gui dependencies.

These changes come from work in the Ubuntu branch, this is to try and keep them from diverging too much.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-02-06 08:52:59 +0000
3+++ debian/changelog 2014-02-12 20:13:51 +0000
4@@ -12,6 +12,9 @@
5 * Updated packaging to account for relocation of man page to
6 checkbox-invocation.1.
7 * Added checkbox-gui dependency on qtdeclarative5-localstorage-plugin.
8+ * Removed build dependencies on qt{multimedia,sensors}5-dev as they're not
9+ actually needed.
10+ * Minor rearranging of checkbox-gui dependencies.
11
12 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Tue, 28 Jan 2014 03:15:31 +0100
13
14
15=== modified file 'debian/control'
16--- debian/control 2014-02-06 08:52:59 +0000
17+++ debian/control 2014-02-12 20:13:51 +0000
18@@ -32,13 +32,10 @@
19 qt4-qmake,
20 qt5-default,
21 qtbase5-dev,
22- qtdeclarative5-cordova-2.8-plugin,
23 qtdeclarative5-dev,
24 qtdeclarative5-dev-tools,
25 qtlocation5-dev,
26- qtmultimedia5-dev,
27 qtscript5-dev,
28- qtsensors5-dev,
29 qttools5-dev,
30 qttools5-dev-tools
31 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
32@@ -432,8 +429,8 @@
33 Architecture: any
34 Depends: checkbox-ng-service,
35 plainbox-provider-checkbox,
36+ qtdeclarative5-localstorage-plugin,
37 qtdeclarative5-qtquick2-plugin,
38- qtdeclarative5-localstorage-plugin,
39 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
40 ${misc:Depends}
41 Provides: checkbox-qt

Subscribers

People subscribed via source and target branches