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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 471
Merged at revision: 472
Proposed branch: lp:~andreserl/maas/lp1563859
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 41 lines (+5/-3)
4 files modified
debian/changelog (+2/-0)
debian/control (+2/-2)
debian/maas-cli.install (+0/-1)
debian/python3-maas-client.install (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/lp1563859
Reviewer Review Type Date Requested Status
LaMont Jones (community) Approve
Review via email: mp+290483@code.launchpad.net

Commit message

Move 'maascli' python package to python3-maas-client.

To post a comment you must log in.
Revision history for this message
LaMont Jones (lamont) wrote :

Looks good.

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-03-28 20:49:35 +0000
+++ debian/changelog 2016-03-30 14:59:53 +0000
@@ -1,6 +1,8 @@
1maas (2.0.0~beta1+bzr4843-0ubuntu2) UNRELEASED; urgency=medium1maas (2.0.0~beta1+bzr4843-0ubuntu2) UNRELEASED; urgency=medium
22
3 * New upstream release, 2.0.0 beta 1 bzr4848 (Standing FFe LP: #1553261)3 * New upstream release, 2.0.0 beta 1 bzr4848 (Standing FFe LP: #1553261)
4 * debian/control: Move 'maascli' package install to
5 python3-maas-client (LP: #1563859)
46
5 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 28 Mar 2016 16:47:58 -04007 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 28 Mar 2016 16:47:58 -0400
68
79
=== modified file 'debian/control'
--- debian/control 2016-03-25 20:14:43 +0000
+++ debian/control 2016-03-30 14:59:53 +0000
@@ -170,8 +170,8 @@
170Depends: python3-oauth,170Depends: python3-oauth,
171 ${misc:Depends},171 ${misc:Depends},
172 ${python3:Depends}172 ${python3:Depends}
173Breaks: python-maas-client173Breaks: python-maas-client, maas-cli ( <= 2.0.0~alpha4+bzr4843-0ubuntu1 )
174Replaces: python-maas-client174Replaces: python-maas-client, maas-cli ( <= 2.0.0~alpha4+bzr4843-0ubuntu1 )
175Description: MAAS python API client (Python 3)175Description: MAAS python API client (Python 3)
176 This package contains the MAAS client API Python modules.176 This package contains the MAAS client API Python modules.
177 .177 .
178178
=== modified file 'debian/maas-cli.install'
--- debian/maas-cli.install 2014-02-12 05:46:08 +0000
+++ debian/maas-cli.install 2016-03-30 14:59:53 +0000
@@ -1,2 +1,1 @@
1debian/extras/maas usr/bin1debian/extras/maas usr/bin
2debian/tmp/usr/lib/python*/dist-packages/maascli
32
=== modified file 'debian/python3-maas-client.install'
--- debian/python3-maas-client.install 2015-12-06 00:08:06 +0000
+++ debian/python3-maas-client.install 2016-03-30 14:59:53 +0000
@@ -1,1 +1,2 @@
1debian/tmp/usr/lib/python3*/dist-packages/apiclient1debian/tmp/usr/lib/python3*/dist-packages/apiclient
2debian/tmp/usr/lib/python3*/dist-packages/maascli

Subscribers

People subscribed via source and target branches

to all changes: