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

Subscribers

People subscribed via source and target branches