Merge lp:~andreserl/maas/1.10_packaging_conflicts into lp:~maas-maintainers/maas/packaging-1.10

Proposed by Andres Rodriguez on 2016-02-01
Status: Merged
Approved by: Andres Rodriguez on 2016-02-01
Approved revision: 444
Merged at revision: 441
Proposed branch: lp:~andreserl/maas/1.10_packaging_conflicts
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 36 lines (+6/-4)
1 file modified
debian/control (+6/-4)
To merge this branch: bzr merge lp:~andreserl/maas/1.10_packaging_conflicts
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-02-01
Review via email: mp+284563@code.launchpad.net

Commit message

Ensure python 2 packages are removed

To post a comment you must log in.
443. By Andres Rodriguez on 2016-02-01

Update breaks/replaces

444. By Andres Rodriguez on 2016-02-01

Update changelog

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-01-26 23:35:50 +0000
3+++ debian/control 2016-02-01 11:23:21 +0000
4@@ -140,8 +140,8 @@
5 Section: python
6 Architecture: all
7 Depends: python3-oauth, ${misc:Depends}, ${python3:Depends}
8-Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
9-Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
10+Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
11+Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
12 Description: MAAS python API client (Python 3)
13 This package contains the MAAS client API Python modules.
14 .
15@@ -176,10 +176,10 @@
16 Conflicts: tftpd-hpa
17 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
18 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
19- python-maas-provisioningserver ( <= 1.9.0 )
20+ python-maas-provisioningserver
21 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
22 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
23- python-maas-provisioningserver ( <= 1.9.0 )
24+ python-maas-provisioningserver
25 Description: MAAS server cluster controller
26 This package contains the MAAS cluster controller, which is responsible
27 for enabling and controlling remote DHCP/TFTP instances on their own
28@@ -202,6 +202,8 @@
29 python3-zope.interface,
30 ${misc:Depends},
31 ${python3:Depends}
32+Breaks: python-django-maas
33+Replaces: python-django-maas
34 Description: MAAS server Django web framework (Python 3)
35 This package provides the Django web framework for MAAS.
36 .

Subscribers

People subscribed via source and target branches