diff -Nru syslinux-4.05+dfsg/debian/changelog syslinux-4.05+dfsg/debian/changelog --- syslinux-4.05+dfsg/debian/changelog 2012-01-06 02:19:21.000000000 +0000 +++ syslinux-4.05+dfsg/debian/changelog 2012-01-27 21:38:22.000000000 +0000 @@ -1,10 +1,11 @@ -syslinux (2:4.05+dfsg-1ubuntu1) precise; urgency=low +syslinux (2:4.05+dfsg-2) unstable; urgency=low - * Fix build failure with --as-needed - - add debian/patches/08-fix-as-needed.patch - - update debian/patches/series + * Adding patch from Micah Gersten to fix FTBFS + with --as-needed (Closes: #654838). + * Switching to numeric (reverse) sorting in extlinux-update, thanks to + Thomas Viehweger (Closes: #657671). - -- Micah Gersten Thu, 05 Jan 2012 20:19:01 -0600 + -- Daniel Baumann Fri, 27 Jan 2012 22:32:28 +0100 syslinux (2:4.05+dfsg-1) unstable; urgency=low diff -Nru syslinux-4.05+dfsg/debian/control syslinux-4.05+dfsg/debian/control --- syslinux-4.05+dfsg/debian/control 2012-01-06 02:17:52.000000000 +0000 +++ syslinux-4.05+dfsg/debian/control 2012-01-27 21:38:22.000000000 +0000 @@ -1,8 +1,7 @@ Source: syslinux Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Daniel Baumann +Maintainer: Daniel Baumann Uploaders: Otavio Salvador Build-Depends: debhelper (>= 8), gcc-multilib [amd64], libc6-dev-i386 [amd64], nasm, python, diff -Nru syslinux-4.05+dfsg/debian/local/extlinux-update syslinux-4.05+dfsg/debian/local/extlinux-update --- syslinux-4.05+dfsg/debian/local/extlinux-update 2011-12-23 13:39:12.000000000 +0000 +++ syslinux-4.05+dfsg/debian/local/extlinux-update 2012-01-27 21:38:19.000000000 +0000 @@ -148,7 +148,7 @@ " # Find linux versions -_VERSIONS="$(cd /boot && ls vmlinuz-* | grep -v .dpkg-tmp | sed -e 's|vmlinuz-||g' | sort -r)" +_VERSIONS="$(cd /boot && ls vmlinuz-* | grep -v .dpkg-tmp | sed -e 's|vmlinuz-||g' | sort -nr)" if [ "$(stat --printf %d /)" = "$(stat --printf %d /boot)" ] then diff -Nru syslinux-4.05+dfsg/debian/patches/08-as-needed.patch syslinux-4.05+dfsg/debian/patches/08-as-needed.patch --- syslinux-4.05+dfsg/debian/patches/08-as-needed.patch 1970-01-01 00:00:00.000000000 +0000 +++ syslinux-4.05+dfsg/debian/patches/08-as-needed.patch 2012-01-27 21:38:19.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Micah Gersten +Description: Fix build failure with --as-needed (Closes: #654838). + +diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile +--- syslinux.orig/utils/Makefile 2011-12-23 14:53:26.653571511 +0100 ++++ syslinux/utils/Makefile 2012-01-22 18:55:03.849466924 +0100 +@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl + $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ + + isohybrid: isohybrid.o isohdpfx.o +- $(CC) $(LDFLAGS) -luuid -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ -luuid + + gethostip: gethostip.o + $(CC) $(LDFLAGS) -o $@ $^ diff -Nru syslinux-4.05+dfsg/debian/patches/08-fix-as-needed.patch syslinux-4.05+dfsg/debian/patches/08-fix-as-needed.patch --- syslinux-4.05+dfsg/debian/patches/08-fix-as-needed.patch 2012-01-06 02:20:54.000000000 +0000 +++ syslinux-4.05+dfsg/debian/patches/08-fix-as-needed.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Fix build failure with --as-needed - See http://wiki.debian.org/ToolChain/DSOLinking#Only_link_with_needed_libraries - . -Author: Micah Gersten - ---- ---- syslinux-4.05+dfsg.orig/utils/Makefile -+++ syslinux-4.05+dfsg/utils/Makefile -@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl - $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ - - isohybrid: isohybrid.o isohdpfx.o -- $(CC) $(LDFLAGS) -luuid -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ -luuid - - gethostip: gethostip.o - $(CC) $(LDFLAGS) -o $@ $^ diff -Nru syslinux-4.05+dfsg/debian/patches/series syslinux-4.05+dfsg/debian/patches/series --- syslinux-4.05+dfsg/debian/patches/series 2012-01-06 02:18:57.000000000 +0000 +++ syslinux-4.05+dfsg/debian/patches/series 2012-01-27 21:38:19.000000000 +0000 @@ -5,4 +5,4 @@ 05-digest-sha.patch 06-geodsp.patch 07-gfxboot-menu-label.patch -08-fix-as-needed.patch +08-as-needed.patch