--- syslinux-legacy-3.63+dfsg.orig/debian/docs +++ syslinux-legacy-3.63+dfsg/debian/docs @@ -2,4 +2,6 @@ README README.gfxboot TODO -doc/* +doc/menu.txt +doc/syslinux.txt +doc/usbkey.txt --- syslinux-legacy-3.63+dfsg.orig/debian/changelog +++ syslinux-legacy-3.63+dfsg/debian/changelog @@ -1,3 +1,23 @@ +syslinux-legacy (2:3.63+dfsg-2ubuntu5) precise; urgency=low + + [ Colin Watson ] + * This package is just for usb-creator, so strip down to only what + usb-creator needs, i.e. syslinux and mbr.bin. 423KB vs. 48KB (on i386) + is a noticeable difference. + + -- Evan Dandrea Mon, 16 Apr 2012 14:27:48 +0100 + +syslinux-legacy (2:3.63+dfsg-2ubuntu4) precise; urgency=low + + [ Evan Dandrea ] + * Resurrect syslinux 3.63 as syslinux-legacy, so that we can write + 10.04 and earlier Ubuntu images in later versions (LP: #645818). + + [ Colin Watson ] + * 15-ubuntu_nasm_2.09.dpatch: Fix build with nasm >= 2.09. + + -- Evan Dandrea Fri, 16 Mar 2012 10:51:50 +0000 + syslinux (2:3.63+dfsg-2ubuntu3) intrepid; urgency=low * Drop mtools back to Recommends now that recommended packages are --- syslinux-legacy-3.63+dfsg.orig/debian/rules +++ syslinux-legacy-3.63+dfsg/debian/rules @@ -54,6 +54,7 @@ rm -f .depend memdisk/.depend rm -f dos/syslinux.com extlinux.bin extlinux.bss extlinux.sys isolinux-debug.bin isolinux.bin ldlinux.bin ldlinux.bss ldlinux.sys memdisk/memdisk memdump/memdump.com pxelinux.0 rm -rf build + rm -f man/*-legacy* dh_clean @@ -64,16 +65,21 @@ dh_installdirs # Installing package - install -d -m 0755 debian/syslinux/usr/bin - install -m 0755 gethostip lss16toppm mkdiskimage ppmtolss16 syslinux2ansi.pl mtools/syslinux extlinux/extlinux debian/syslinux/usr/bin + install -d -m 0755 debian/syslinux-legacy/usr/bin + install -m 0755 mtools/syslinux debian/syslinux-legacy/usr/bin + # Do not conflict with binaries in the current syslinux package + for FILE in debian/syslinux-legacy/usr/bin/*; \ + do \ + mv $$FILE $$FILE-legacy; \ + done + # Or man pages + for FILE in man/syslinux.1; \ + do \ + cp $$FILE $$(echo $$FILE | sed 's,\(.*\)\.,\1-legacy.,'); \ + done - install -d -m 0755 debian/syslinux/usr/lib/syslinux - install -m 0644 build/* debian/syslinux/usr/lib/syslinux - - install -m 0644 copybs.com isolinux.bin isolinux-debug.bin ldlinux.bss ldlinux.sys pxelinux.0 com32/modules/*.c32 com32/menu/*.c32 dos/syslinux.com mbr/mbr.bin memdisk/memdisk debian/syslinux/usr/lib/syslinux - - # Renaming files - mv debian/syslinux/usr/bin/syslinux2ansi.pl debian/syslinux/usr/bin/syslinux2ansi + install -d -m 0755 debian/syslinux-legacy/usr/lib/syslinux-legacy + install -m 0644 mbr/mbr.bin debian/syslinux-legacy/usr/lib/syslinux-legacy binary-indep: build install --- syslinux-legacy-3.63+dfsg.orig/debian/control +++ syslinux-legacy-3.63+dfsg/debian/control @@ -1,4 +1,4 @@ -Source: syslinux +Source: syslinux-legacy Section: utils Priority: optional Maintainer: Ubuntu Core Developers @@ -8,7 +8,7 @@ Standards-Version: 3.8.0 Homepage: http://syslinux.zytor.com/ -Package: syslinux +Package: syslinux-legacy Architecture: amd64 i386 lpia Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: mtools --- syslinux-legacy-3.63+dfsg.orig/debian/manpages +++ syslinux-legacy-3.63+dfsg/debian/manpages @@ -1 +1 @@ -man/* +man/*-legacy* --- syslinux-legacy-3.63+dfsg.orig/debian/patches/15-ubuntu_nasm_2.09.dpatch +++ syslinux-legacy-3.63+dfsg/debian/patches/15-ubuntu_nasm_2.09.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15-ubuntu_nasm_0.9.dpatch by Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Build with nasm >= 2.09. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' syslinux-3.63+dfsg~/layout.inc syslinux-3.63+dfsg/layout.inc +--- syslinux-3.63+dfsg~/layout.inc 2012-03-24 01:22:32.000000000 +0000 ++++ syslinux-3.63+dfsg/layout.inc 2012-03-24 01:22:39.000000000 +0000 +@@ -42,6 +42,8 @@ + ; + org TEXT_START + ++ sectalign off ++ + ; Use .earlybss for things that MUST be in low memory. + section .earlybss nobits start=BSS_START + section .bcopy32 align=4 valign=16 follows=.data vfollows=.earlybss +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' syslinux-3.63+dfsg~/memdisk/memset.S syslinux-3.63+dfsg/memdisk/memset.S +--- syslinux-3.63+dfsg~/memdisk/memset.S 2008-04-10 18:30:35.000000000 +0100 ++++ syslinux-3.63+dfsg/memdisk/memset.S 2012-03-24 01:22:48.000000000 +0000 +@@ -26,4 +26,4 @@ + popl %edi + ret + +- .size memcpy,.-memcpy ++ .size memset,.-memset --- syslinux-legacy-3.63+dfsg.orig/debian/patches/00list +++ syslinux-legacy-3.63+dfsg/debian/patches/00list @@ -6,3 +6,4 @@ 12-ubuntu_localboot-gfxdone.dpatch 13-ubuntu_com32_gfxboot.dpatch 14-ubuntu_gfxboot_force_prompt.dpatch +15-ubuntu_nasm_2.09.dpatch