Merge lp:~andreserl/maas/missing_dep into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 485
Merged at revision: 485
Proposed branch: lp:~andreserl/maas/missing_dep
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 44 lines (+11/-5)
2 files modified
debian/changelog (+8/-2)
debian/control (+3/-3)
To merge this branch: bzr merge lp:~andreserl/maas/missing_dep
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+292063@code.launchpad.net

This proposal supersedes a proposal from 2016-04-16.

Commit message

Code was moved around in packaging, and a required dep was not. This fixes it.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

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 2016-04-14 15:54:20 +0000
3+++ debian/changelog 2016-04-16 02:30:14 +0000
4@@ -1,8 +1,14 @@
5-maas (2.0.0~beta3+bzr4920-0ubuntu1) UNRELEASED; urgency=medium
6+maas (2.0.0~beta2+bzr4920-0ubuntu3) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9
10- -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 14 Apr 2016 11:54:02 -0400
11+ -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:27:56 -0400
12+
13+maas (2.0.0~beta2+bzr4920-0ubuntu2) xenial; urgency=medium
14+
15+ * debian/control: Add missing dep on python3-httplib2
16+
17+ -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:23:55 -0400
18
19 maas (2.0.0~beta2+bzr4920-0ubuntu1) xenial; urgency=medium
20
21
22=== modified file 'debian/control'
23--- debian/control 2016-04-07 23:06:11 +0000
24+++ debian/control 2016-04-16 02:30:14 +0000
25@@ -152,8 +152,7 @@
26
27 Package: maas-cli
28 Architecture: all
29-Depends: python3-httplib2,
30- python3-maas-client (= ${binary:Version}),
31+Depends: python3-maas-client (= ${binary:Version}),
32 ${misc:Depends},
33 ${python3:Depends}
34 Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
35@@ -167,7 +166,8 @@
36 Package: python3-maas-client
37 Section: python
38 Architecture: all
39-Depends: python3-oauth,
40+Depends: python3-httplib2,
41+ python3-oauth,
42 ${misc:Depends},
43 ${python3:Depends}
44 Breaks: python-maas-client, maas-cli ( <= 2.0.0~alpha4+bzr4843-0ubuntu1 )

Subscribers

People subscribed via source and target branches

to all changes: