diff -Nru maas-1.7.1+bzr3341/debian/changelog maas-1.7.1+bzr3341/debian/changelog --- maas-1.7.1+bzr3341/debian/changelog 2015-02-04 22:34:47.000000000 -0800 +++ maas-1.7.1+bzr3341/debian/changelog 2015-03-18 11:11:47.000000000 -0700 @@ -1,3 +1,9 @@ +maas (1.7.1+bzr3341-0ubuntu2) vivid; urgency=medium + + * Depend on pxelinux for pxelinux.0, not on syslinux-dev. LP: #1433697. + + -- Steve Langasek Wed, 18 Mar 2015 11:11:47 -0700 + maas (1.7.1+bzr3341-0ubuntu1) vivid; urgency=medium * New upstream release, 1.7.1 bzr3341: diff -Nru maas-1.7.1+bzr3341/debian/control maas-1.7.1+bzr3341/debian/control --- maas-1.7.1+bzr3341/debian/control 2015-01-30 04:00:16.000000000 -0800 +++ maas-1.7.1+bzr3341/debian/control 2015-03-18 11:08:09.000000000 -0700 @@ -161,7 +161,7 @@ python-twisted, python-zope.interface, rsyslog, - syslinux-dev | syslinux-common (<< 3:6.00~pre4+dfsg-5), + pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5), syslinux-common, tgt, ubuntu-cloudimage-keyring, diff -Nru maas-1.7.1+bzr3341/debian/patches/series maas-1.7.1+bzr3341/debian/patches/series --- maas-1.7.1+bzr3341/debian/patches/series 2015-01-30 04:00:16.000000000 -0800 +++ maas-1.7.1+bzr3341/debian/patches/series 2015-03-18 11:14:01.000000000 -0700 @@ -1,2 +1,3 @@ 01-fix-database-settings.patch 02-pserv-config.patch +syslinux-pxelinux-paths.patch diff -Nru maas-1.7.1+bzr3341/debian/patches/syslinux-pxelinux-paths.patch maas-1.7.1+bzr3341/debian/patches/syslinux-pxelinux-paths.patch --- maas-1.7.1+bzr3341/debian/patches/syslinux-pxelinux-paths.patch 1969-12-31 16:00:00.000000000 -0800 +++ maas-1.7.1+bzr3341/debian/patches/syslinux-pxelinux-paths.patch 2015-03-18 11:14:25.000000000 -0700 @@ -0,0 +1,15 @@ +Description: Depend on pxelinux for pxelinux.0, not on syslinux-dev. +Author: Steve Langasek +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1433697 + +--- maas-1.7.1+bzr3341.orig/src/provisioningserver/boot/pxe.py ++++ maas-1.7.1+bzr3341/src/provisioningserver/boot/pxe.py +@@ -34,7 +34,7 @@ BOOTLOADERS = ['pxelinux.0', 'chain.c32' + # Possible locations in which to find the bootloader files. Search these + # in this order for each file. (This exists because locations differ + # across Ubuntu releases.) +-BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios'] ++BOOTLOADER_DIRS = ['/usr/lib/PXELINUX', '/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios'] + + # List of possible directories where to find additioning bootloader files. + # The first existing directory will be symlinked to /syslinux/ inside