Merge lp:~zyga/checkbox/fix-1308697 into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-gui

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~zyga/checkbox/fix-1308697
Merge into: lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-gui
Diff against target: 53 lines (+17/-12)
2 files modified
debian/changelog (+2/-0)
debian/control (+15/-12)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1308697
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+216196@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1, oops, strange that that dependency was removed, I remember it being there at some point.

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-03-27 15:26:46 +0000
3+++ debian/changelog 2014-04-16 19:07:35 +0000
4@@ -3,5 +3,7 @@
5 * debian: fork packaging from monolithic ppa packaging
6 * debian/changelog: come up with semi-arbitrary version based on
7 checkbox-gui package in Ubuntu 14.04
8+ * debian/control: use ${shlibs:Depends} for checkbox-gui LP: #1308697
9+ * debian/control: re-indent and sort all dependencies
10
11 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Thu, 27 Mar 2014 11:14:43 +0100
12
13=== modified file 'debian/control'
14--- debian/control 2014-03-27 15:26:46 +0000
15+++ debian/control 2014-04-16 19:07:35 +0000
16@@ -3,22 +3,25 @@
17 Priority: optional
18 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
19 Standards-Version: 3.9.3
20-Build-Depends: debhelper (>= 9.2),
21- libqt5sql5-sqlite,
22- qt5-default,
23- qtbase5-dev,
24- qtdeclarative5-dev,
25- qttools5-dev-tools
26+Build-Depends:
27+ debhelper (>= 9.2),
28+ libqt5sql5-sqlite,
29+ qt5-default,
30+ qtbase5-dev,
31+ qtdeclarative5-dev,
32+ qttools5-dev-tools,
33 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-checkbox-gui/
34
35 Package: checkbox-gui
36 Architecture: any
37-Depends: checkbox-ng-service,
38- plainbox-provider-checkbox,
39- qtdeclarative5-localstorage-plugin,
40- qtdeclarative5-qtquick2-plugin,
41- qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
42- ${misc:Depends}
43+Depends:
44+ ${misc:Depends},
45+ ${shlibs:Depends},
46+ checkbox-ng-service (>= 0.3),
47+ plainbox-provider-checkbox (>= 0.4),
48+ qtdeclarative5-localstorage-plugin,
49+ qtdeclarative5-qtquick2-plugin,
50+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
51 Provides: checkbox-qt
52 Replaces: checkbox-qt
53 Description: QML based interface for system testing based on PlainBox.

Subscribers

People subscribed via source and target branches