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

Proposed by Raphaël Badin on 2015-07-01
Status: Merged
Approved by: Mike Pontillo on 2015-07-04
Approved revision: 409
Merged at revision: 413
Proposed branch: lp:~rvb/maas/packaging-1413388
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+3/-1)
2 files modified
debian/changelog (+3/-0)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~rvb/maas/packaging-1413388
Reviewer Review Type Date Requested Status
Ricardo Bánffy (community) 2015-07-01 Approve on 2015-07-02
Review via email: mp+263475@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 forward ported on trunk before this can land.

To post a comment you must log in.
Ricardo Bánffy (rbanffy) :
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 2015-06-26 11:49:32 +0000
3+++ debian/changelog 2015-07-01 08:08:07 +0000
4@@ -4,6 +4,9 @@
5
6 [ Raphaël Badin ]
7 * Enable proxy_wstunnel module.
8+ * Drop dependency on python-iscpy: the code has been integrated into
9+ MAAS. (LP: #1413388).
10+
11
12 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 12 Jun 2015 14:16:47 -0400
13
14
15=== modified file 'debian/control'
16--- debian/control 2015-06-05 18:05:28 +0000
17+++ debian/control 2015-07-01 08:08:07 +0000
18@@ -209,7 +209,6 @@
19 Architecture: all
20 Depends: bind9,
21 maas-region-controller-min (= ${binary:Version}),
22- python-iscpy,
23 ${misc:Depends}
24 Conflicts: dnsmasq
25 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)

Subscribers

People subscribed via source and target branches