diffstat of debian/ for memtest86+_4.20-1.1 memtest86+_4.20-1.1ubuntu3 changelog | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ control | 3 grub | 41 +++++++------ postrm | 3 4 files changed, 219 insertions(+), 20 deletions(-) diff -u memtest86+-4.20/debian/changelog memtest86+-4.20/debian/changelog --- memtest86+-4.20/debian/changelog +++ memtest86+-4.20/debian/changelog @@ -1,3 +1,27 @@ +memtest86+ (4.20-1.1ubuntu3) raring; urgency=low + + * Fix test#7 false positives due to compiler issues. (LP: #1071209) + Original patch author Torsten Duwe . + + -- Chris J Arges Tue, 04 Dec 2012 16:23:35 -0600 + +memtest86+ (4.20-1.1ubuntu2) quantal; urgency=low + + * Don't present the GRUB menu option on EFI systems, since it won't work + (see LP #883017). + + -- Colin Watson Thu, 11 Oct 2012 14:14:55 +0100 + +memtest86+ (4.20-1.1ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Sun, 27 Nov 2011 09:55:42 +0000 + memtest86+ (4.20-1.1) unstable; urgency=low * Non-maintainer upload. @@ -11,6 +35,16 @@ -- Christian Perrier Tue, 28 Jun 2011 07:15:27 +0200 +memtest86+ (4.20-1ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian (LP: #772252). Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Mon, 02 May 2011 23:45:56 +0100 + memtest86+ (4.20-1) unstable; urgency=low * New upstream release. @@ -25,6 +59,16 @@ -- Yann Dirson Sat, 19 Mar 2011 23:40:07 +0100 +memtest86+ (4.10-1.1ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Fri, 22 Oct 2010 12:17:13 +0100 + memtest86+ (4.10-1.1) unstable; urgency=low * Non-maintainer upload. @@ -34,6 +78,23 @@ -- Christian Perrier Tue, 19 Oct 2010 07:24:39 +0200 +memtest86+ (4.10-1ubuntu2) maverick; urgency=low + + * Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some systems + at the moment (LP: #640686). + + -- Colin Watson Fri, 24 Sep 2010 16:45:47 +0100 + +memtest86+ (4.10-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. (LP: #599070) Remaining changes: + - Only run update-grub in the postrm on remove/purge. + (forwarded to debian as #587340) + - Update maintainer field. + + -- Luke Faraone Sun, 27 Jun 2010 12:54:15 -0400 + memtest86+ (4.10-1) unstable; urgency=low * The "not yet source format 3.0" release. @@ -85,6 +146,33 @@ -- Iustin Pop Sun, 06 Dec 2009 12:20:39 +0100 +memtest86+ (4.00-2ubuntu3) lucid; urgency=low + + * Only run update-grub in the postrm on remove/purge. + + -- Colin Watson Tue, 23 Mar 2010 09:26:27 +0000 + +memtest86+ (4.00-2ubuntu2) lucid; urgency=low + + * Reapply dropped patch from karmic: + - Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + * Cache results of prepare_grub_to_access_device to speed up update-grub + runs a little. + + -- Colin Watson Mon, 22 Feb 2010 16:06:40 +0000 + +memtest86+ (4.00-2ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - debian/grub: check for existance of /usr/lib/grub/grub-mkconfig_lib + - debian/postinst: Only run update-grub2 in postinst if + /boot/grub/grub.cfg exists + + -- Michael Vogt Mon, 09 Nov 2009 17:09:57 +0100 + memtest86+ (4.00-2) unstable; urgency=low * Fix wrong integration of grub2 patch (Closes: #549125). @@ -104,6 +192,46 @@ -- Yann Dirson Tue, 29 Sep 2009 23:40:15 +0200 +memtest86+ (2.11-3ubuntu5) karmic; urgency=low + + * debian/grub: + - check for existance of /usr/lib/grub/grub-mkconfig_lib before + sourcing it (LP: #459080). This fixes a upgrade failure when + the memtest86+ postinst is run but the new grub-common is not + yet installed + + -- Michael Vogt Fri, 23 Oct 2009 16:14:27 +0200 + +memtest86+ (2.11-3ubuntu4) karmic; urgency=low + + * Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + + -- Colin Watson Mon, 28 Sep 2009 10:01:25 +0100 + +memtest86+ (2.11-3ubuntu3) karmic; urgency=low + + * Use grub2's 16-bit Linux loader, not the 32-bit one (LP: #424506). + + -- Colin Watson Fri, 04 Sep 2009 22:19:32 +0100 + +memtest86+ (2.11-3ubuntu2) karmic; urgency=low + + * Fix grub2 menu hook to use grub-mkconfig_lib rather than the deprecated + update-grub_lib (thanks, Alex Valavanis; LP: #384627). + * Only run update-grub2 in postinst if /boot/grub/grub.cfg exists. This + makes installation in chroots work rather better. + + -- Colin Watson Wed, 24 Jun 2009 16:55:39 +0100 + +memtest86+ (2.11-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (Closes LP: #299161), remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + + -- Chris Cheney Thu, 26 Mar 2009 11:45:00 -0500 + memtest86+ (2.11-3) unstable; urgency=low * Upload to squeeze. @@ -152,6 +280,18 @@ -- Yann Dirson Sat, 31 Jan 2009 00:26:54 +0100 +memtest86+ (2.01-1.1ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Check for existence of /boot/grub in postrm. + - Install ELF image of memtest86+ in the binary package. + * Sync up postrm should-we-run-update-grub2 check with postinst. + + -- Colin Watson Thu, 13 Nov 2008 10:37:16 +0000 + memtest86+ (2.01-1.1) unstable; urgency=low * Non-maintainer upload. @@ -160,6 +300,30 @@ -- Barry deFreese Thu, 02 Oct 2008 21:13:33 -0400 +memtest86+ (2.01-1ubuntu2) intrepid; urgency=low + + * Build with -O1 rather than -Os (from + https://qa.mandriva.com/show_bug.cgi?id=42679; LP: #246412). + + -- Colin Watson Thu, 11 Sep 2008 21:03:51 +0100 + +memtest86+ (2.01-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Merge basically the same as the one from Saïvann Carignan, thanks for + your work! LP: #192517 + * Simplify the patch from LP #129614, the preinst is fine in debian, the + postinst needs to check for presence of /boot/grub. + * Do not call update-grub, but update-grub2. See + http://bugs.debian.org/460080 for details. + * install ELF image of memtest86+ in the binary package Thanks to Forest + Bond for the patch. (LP: #175720). + + -- Reinhard Tartler Tue, 20 May 2008 17:04:27 +0200 + memtest86+ (2.01-1) unstable; urgency=low * New upstream release (Closes: #468780). @@ -171,6 +335,17 @@ -- Yann Dirson Wed, 23 Apr 2008 21:21:47 +0200 +memtest86+ (1.70-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * Check for /boot/grub/menu.lst rather than /boot/grub/menu.lst in + post{inst,rm}, LP: #129614 + + -- Reinhard Tartler Wed, 26 Sep 2007 22:43:24 +0200 + memtest86+ (1.70-3) unstable; urgency=low * Build-depend on gcc-multilib on amd64 (Closes: #426239). @@ -182,6 +357,23 @@ -- Yann Dirson Sun, 29 Jul 2007 16:17:18 +0200 +memtest86+ (1.70-2ubuntu2) gutsy; urgency=low + + * debian/control: Add lpia as supported architecture. + + -- Matthias Klose Tue, 31 Jul 2007 00:04:33 +0200 + +memtest86+ (1.70-2ubuntu1) gutsy; urgency=low + + * Merge to Debian unstable; remaining Ubuntu changes: + - debian/control: Add libc6-dev-i386 build dependency on amd64 to fix + FTBFS. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * debian/control: Set Ubuntu maintainer. + + -- Martin Pitt Mon, 21 May 2007 09:39:41 +0200 + memtest86+ (1.70-2) unstable; urgency=low * Upload to unstable now that etch is released. diff -u memtest86+-4.20/debian/postrm memtest86+-4.20/debian/postrm --- memtest86+-4.20/debian/postrm +++ memtest86+-4.20/debian/postrm @@ -1,7 +1,8 @@ #!/bin/sh set -e -if test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then +if ([ "$1" = remove ] || [ "$1" = purge ]) && \ + test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then update-grub2 fi diff -u memtest86+-4.20/debian/control memtest86+-4.20/debian/control --- memtest86+-4.20/debian/control +++ memtest86+-4.20/debian/control @@ -1,7 +1,8 @@ Source: memtest86+ Section: misc Priority: optional -Maintainer: Yann Dirson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Yann Dirson Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64], po-debconf, genisoimage Homepage: http://www.memtest.org/ diff -u memtest86+-4.20/debian/grub memtest86+-4.20/debian/grub --- memtest86+-4.20/debian/grub +++ memtest86+-4.20/debian/grub @@ -13,6 +13,11 @@ exit 0 fi +# We need 16-bit boot, which isn't available on EFI. +if [ -d /sys/firmware/efi ]; then + exit 0 +fi + # We can't cope with loop-mounted devices here. case ${GRUB_DEVICE_BOOT} in /dev/loop/*|/dev/loop[0-9]) exit 0 ;; @@ -42,18 +47,18 @@ -if test -e /boot/memtest86+_multiboot.bin ; then - MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) - echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 - cat << EOF -menuentry "Memory test (memtest86+, experimental multiboot)" { -EOF - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - multiboot $MEMTESTPATH -} -menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" { -EOF - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - multiboot $MEMTESTPATH console=ttyS0,115200n8 -} -EOF -fi +#if test -e /boot/memtest86+_multiboot.bin ; then +# MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) +# echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 +# cat << EOF +#menuentry "Memory test (memtest86+, experimental multiboot)" { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH +#} +#menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH console=ttyS0,115200n8 +#} +#EOF +#fi