Merge lp:~zyga/checkbox/fix-1316192 into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ng

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 7
Merged at revision: 7
Proposed branch: lp:~zyga/checkbox/fix-1316192
Merge into: lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ng
Diff against target: 34 lines (+4/-2)
2 files modified
debian/changelog (+2/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1316192
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+218306@code.launchpad.net

This proposal supersedes a proposal from 2014-05-05.

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

Thanks!

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-04-24 09:15:01 +0000
3+++ debian/changelog 2014-05-05 15:43:05 +0000
4@@ -13,6 +13,8 @@
5 * debian/*.install: install everything manually
6 * debian/control: build depend on python3-plainbox-doc and python3-doc for
7 intersphinx database links.
8+ * debian/control: replace dependency on python3:any with python3
9+ (LP: #1316192)
10
11 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Wed, 09 Apr 2014 18:34:16 +0200
12
13
14=== modified file 'debian/control'
15--- debian/control 2014-04-28 15:32:48 +0000
16+++ debian/control 2014-05-05 15:43:05 +0000
17@@ -32,7 +32,7 @@
18 ${misc:Depends},
19 python3,
20 python3-checkbox-ng (= ${binary:Version}),
21- python3:any (>= 3.2),
22+ python3 (>= 3.2),
23 Replaces: checkbox (<< 0.17.6-0ubuntu1)
24 Breaks: checkbox (<< 0.17.6-0ubuntu1)
25 Description: PlainBox based test runner
26@@ -64,7 +64,7 @@
27 python3-plainbox (>= 0.5.3),
28 python3-requests (>= 1.0),
29 python3-xlsxwriter,
30- python3:any (>= 3.2),
31+ python3 (>= 3.2),
32 Description: PlainBox based test runner (Python 3 library)
33 CheckBoxNG is a hardware testing tool useful for certifying laptops,
34 desktops and servers. It is a new version of CheckBox that is built

Subscribers

People subscribed via source and target branches