MAAS

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

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

Commit message

Depend on pxelinux for pxelinux.0, not on syslinux-dev. (LP: #1433697)

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
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-03-17 22:47:06 +0000
3+++ debian/changelog 2015-03-18 18:42:52 +0000
4@@ -1,6 +1,7 @@
5 maas (1.8.0~alpha8+bzr3664-0ubuntu1) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ [ Steve Langasek ]
9+ * Depend on pxelinux for pxelinux.0, not on syslinux-dev. (LP: #1433697)
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Mar 2015 18:46:41 -0400
12
13
14=== modified file 'debian/control'
15--- debian/control 2015-03-10 20:56:06 +0000
16+++ debian/control 2015-03-18 18:42:52 +0000
17@@ -159,7 +159,7 @@
18 python-twisted,
19 python-zope.interface,
20 rsyslog,
21- syslinux-dev | syslinux-common (<< 3:6.00~pre4+dfsg-5),
22+ pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),
23 syslinux-common,
24 tgt,
25 uuid-runtime,

Subscribers

People subscribed via source and target branches

to all changes: