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.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

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 2016-04-14 15:54:20 +0000
+++ debian/changelog 2016-04-16 02:30:14 +0000
@@ -1,8 +1,14 @@
1maas (2.0.0~beta3+bzr4920-0ubuntu1) UNRELEASED; urgency=medium1maas (2.0.0~beta2+bzr4920-0ubuntu3) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
44
5 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 14 Apr 2016 11:54:02 -04005 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:27:56 -0400
6
7maas (2.0.0~beta2+bzr4920-0ubuntu2) xenial; urgency=medium
8
9 * debian/control: Add missing dep on python3-httplib2
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:23:55 -0400
612
7maas (2.0.0~beta2+bzr4920-0ubuntu1) xenial; urgency=medium13maas (2.0.0~beta2+bzr4920-0ubuntu1) xenial; urgency=medium
814
915
=== modified file 'debian/control'
--- debian/control 2016-04-07 23:06:11 +0000
+++ debian/control 2016-04-16 02:30:14 +0000
@@ -152,8 +152,7 @@
152152
153Package: maas-cli153Package: maas-cli
154Architecture: all154Architecture: all
155Depends: python3-httplib2,155Depends: python3-maas-client (= ${binary:Version}),
156 python3-maas-client (= ${binary:Version}),
157 ${misc:Depends},156 ${misc:Depends},
158 ${python3:Depends}157 ${python3:Depends}
159Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)158Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
@@ -167,7 +166,8 @@
167Package: python3-maas-client166Package: python3-maas-client
168Section: python167Section: python
169Architecture: all168Architecture: all
170Depends: python3-oauth,169Depends: python3-httplib2,
170 python3-oauth,
171 ${misc:Depends},171 ${misc:Depends},
172 ${python3:Depends}172 ${python3:Depends}
173Breaks: python-maas-client, maas-cli ( <= 2.0.0~alpha4+bzr4843-0ubuntu1 )173Breaks: python-maas-client, maas-cli ( <= 2.0.0~alpha4+bzr4843-0ubuntu1 )

Subscribers

People subscribed via source and target branches

to all changes: