Merge lp:~rvb/maas/packaging.utopic-1413388 into lp:~maas-maintainers/maas/packaging.utopic

Proposed by Raphaël Badin
Status: Merged
Approved by: Mike Pontillo
Approved revision: 363
Merged at revision: 364
Proposed branch: lp:~rvb/maas/packaging.utopic-1413388
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 25 lines (+3/-2)
2 files modified
debian/changelog (+3/-1)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~rvb/maas/packaging.utopic-1413388
Reviewer Review Type Date Requested Status
Ricardo Bánffy (community) Approve
Review via email: mp+263477@code.launchpad.net

Commit message

Drop dependency on python-iscpy: the code has been integrated into MAAS.

Description of the change

Note: this needs https://code.launchpad.net/~mpontillo/maas/remove-iscpy-1.7/+merge/263450 to be landed before this can land.

To post a comment you must log in.
Revision history for this message
Ricardo Bánffy (rbanffy) :
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 2015-05-11 11:43:46 +0000
+++ debian/changelog 2015-07-01 08:08:37 +0000
@@ -1,6 +1,8 @@
1maas (1.7.5+bzr3366-0ubuntu1) UNRELEASED; urgency=medium1maas (1.7.5+bzr3366-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 [ Raphaël Badin ]
4 * Drop dependency on python-iscpy: the code has been integrated into
5 MAAS. (LP: #1413388).
46
5 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 11 May 2015 12:43:31 +01007 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 11 May 2015 12:43:31 +0100
68
79
=== modified file 'debian/control'
--- debian/control 2015-04-23 17:49:59 +0000
+++ debian/control 2015-07-01 08:08:37 +0000
@@ -217,7 +217,6 @@
217Architecture: all217Architecture: all
218Depends: bind9,218Depends: bind9,
219 maas-region-controller-min (= ${binary:Version}),219 maas-region-controller-min (= ${binary:Version}),
220 python-iscpy,
221 ${misc:Depends}220 ${misc:Depends}
222Conflicts: dnsmasq221Conflicts: dnsmasq
223Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)222Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)

Subscribers

People subscribed via source and target branches

to all changes: