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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 451
Merged at revision: 451
Proposed branch: lp:~andreserl/maas/fix_lp1553647
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/fix_lp1553647
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+288221@code.launchpad.net

This proposal supersedes a proposal from 2016-03-06.

Commit message

Depends on iproute2 instead. (LP: #1553647)

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-03-06 16:53:43 +0000
3+++ debian/changelog 2016-03-06 16:57:11 +0000
4@@ -12,6 +12,7 @@
5 * Allow 'dhcpd' to access /usr/sbin/maas-provision via
6 sudoers file (LP: #1552775)
7 * debian/extras/maas: Replace shell wrapper with python. (LP: #1553605)
8+ * debian/control: Depends on iproute2 instead. (LP: #1553647)
9
10 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 18:18:52 +0100
11
12
13=== modified file 'debian/control'
14--- debian/control 2016-03-03 16:20:12 +0000
15+++ debian/control 2016-03-06 16:57:11 +0000
16@@ -51,7 +51,7 @@
17 Architecture: all
18 Depends: apache2,
19 bind9utils,
20- iproute,
21+ iproute2,
22 libjs-angularjs,
23 libjs-yui3-full,
24 libjs-yui3-min,

Subscribers

People subscribed via source and target branches

to all changes: