diff -Nru syslinux-4.05+dfsg/debian/changelog syslinux-4.05+dfsg/debian/changelog --- syslinux-4.05+dfsg/debian/changelog 2012-05-23 05:52:48.000000000 +0100 +++ syslinux-4.05+dfsg/debian/changelog 2012-06-06 18:27:16.000000000 +0100 @@ -1,3 +1,11 @@ +syslinux (2:4.05+dfsg-5ubuntu1) quantal; urgency=low + + * Fix reference to linux/ext2_fs.h which is now removed from the kernel + exported headers as of v3.4. Instead use the offical userspace copy + exported by e2fslibs-dev. Fixes FTBS with 3.4.x kernels. + + -- Andy Whitcroft Wed, 06 Jun 2012 17:01:12 +0100 + syslinux (2:4.05+dfsg-5) unstable; urgency=low * Adding patch to add alternative locations in for configuration files diff -Nru syslinux-4.05+dfsg/debian/control syslinux-4.05+dfsg/debian/control --- syslinux-4.05+dfsg/debian/control 2012-05-23 05:52:48.000000000 +0100 +++ syslinux-4.05+dfsg/debian/control 2012-06-06 18:34:21.000000000 +0100 @@ -1,11 +1,12 @@ Source: syslinux Section: utils Priority: optional -Maintainer: Daniel Baumann +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Daniel Baumann Uploaders: Otavio Salvador Build-Depends: debhelper (>= 9), gcc-4.6, gcc-multilib [amd64], libc6-dev-i386 [amd64], - nasm, python, uuid-dev + nasm, python, uuid-dev, e2fslibs-dev Standards-Version: 3.9.3 Homepage: http://syslinux.zytor.com/ diff -Nru syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch --- syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch 1970-01-01 01:00:00.000000000 +0100 +++ syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch 2012-06-06 18:24:37.000000000 +0100 @@ -0,0 +1,13 @@ +Index: syslinux-4.05+dfsg/libinstaller/linuxioctl.h +=================================================================== +--- syslinux-4.05+dfsg.orig/libinstaller/linuxioctl.h 2011-12-09 18:28:17.000000000 +0000 ++++ syslinux-4.05+dfsg/libinstaller/linuxioctl.h 2012-06-06 18:24:27.505927482 +0100 +@@ -19,7 +19,7 @@ + + #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ + #undef SECTOR_BITS +-#include /* EXT2_IOC_* */ ++#include /* EXT2_IOC_* */ + + #ifndef FAT_IOCTL_GET_ATTRIBUTES + # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) diff -Nru syslinux-4.05+dfsg/debian/patches/series syslinux-4.05+dfsg/debian/patches/series --- syslinux-4.05+dfsg/debian/patches/series 2012-05-23 05:52:48.000000000 +0100 +++ syslinux-4.05+dfsg/debian/patches/series 2012-06-06 18:24:00.000000000 +0100 @@ -8,3 +8,4 @@ 08-as-needed.patch 09-efi-mbr.patch 10-conffiles.patch +11-local-ext2_fs.h.patch