tags 523114 + patch tags 553291 + patch thanks Dear maintainer,
I've prepared an NMU for memtest86 (versioned as 3.5-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -u memtest86-3.5/debian/changelog memtest86-3.5/debian/changelog --- memtest86-3.5/debian/changelog +++ memtest86-3.5/debian/changelog @@ -1,3 +1,18 @@ +memtest86 (3.5-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Replace manual propt with debconf (Closes: #553291). + * Compute the grub entry (either 'linux' or 'linux16') depending on + whether we find the old or new grub lib file, to support upgrades + from lenny + * Fix "please source grub-mkconfig_lib instead of deprecated update- + grub_lib in /etc/grub.d/20_memtest86", also via the above mechanism + (Closes: #523114) + * Update suggests to a recent version of grub2 + * Add a lintian override for statically-linked-binary (which is expected) + + -- Iustin Pop <iu...@k1024.org> Sun, 06 Dec 2009 12:17:12 +0100 + memtest86 (3.5-2) unstable; urgency=low * Sync'd packaging with memtest86+ 2.11-3. diff -u memtest86-3.5/debian/control memtest86-3.5/debian/control --- memtest86-3.5/debian/control +++ memtest86-3.5/debian/control @@ -2,14 +2,14 @@ Section: misc Priority: optional Maintainer: Yann Dirson <dir...@debian.org> -Build-Depends: debhelper (>> 5), dh-buildinfo +Build-Depends: debhelper (>> 5), dh-buildinfo, po-debconf Homepage: http://www.memtest86.com/ Standards-Version: 3.8.0 Package: memtest86 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 lpia hurd-i386 Depends: ${misc:Depends} -Suggests: hwtools, memtester, kernel-patch-badram, memtest86+, grub2 (>=1.95+20070515-1) | grub (>= 0.95+cvs20040624), mtools +Suggests: hwtools, memtester, kernel-patch-badram, memtest86+, grub2 (>=1.96+20090523-1) | grub (>= 0.95+cvs20040624), mtools Description: thorough real-mode memory tester Memtest86 scans your RAM for errors. . diff -u memtest86-3.5/debian/postinst memtest86-3.5/debian/postinst --- memtest86-3.5/debian/postinst +++ memtest86-3.5/debian/postinst @@ -1,23 +1,20 @@ #!/bin/sh set -e -# offer to run LILO -# (adapted from snippet by chr....@gmx.net) -if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && - [ "${DEBIAN_FRONTEND}" != "noninteractive" ] && +. /usr/share/debconf/confmodule + +if [ "$1" = configure ]; then + db_get shared/memtest86-run-lilo + if [ "$RET" = true ] && + [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep "image.*=.*/boot/memtest86.bin" /etc/lilo.conf >/dev/null -then - echo "You seem to have an entry for memtest86 in /etc/lilo.conf." - printf "Run lilo now [y/N]? " - read c - if [ "$c" = "y" ] || [ "$c" = "Y" ] then lilo fi -fi -if [ "$1" = "configure" ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then - update-grub2 + if [ -x "`which update-grub2 2>/dev/null`" ] ; then + update-grub2 + fi fi #DEBHELPER# diff -u memtest86-3.5/debian/rules memtest86-3.5/debian/rules --- memtest86-3.5/debian/rules +++ memtest86-3.5/debian/rules @@ -37,6 +37,10 @@ install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE) dh_installman debian/make-$(PACKAGE)-boot-floppy.1 + #install the lintian override + install -d debian/$(PACKAGE)/usr/share/lintian/overrides + install -m644 debian/lintian-overrides \ + debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE) # Build architecture-independent files here. binary-indep: build install @@ -46,7 +50,7 @@ binary-arch: build install dh_testdir dh_testroot -# dh_installdebconf + dh_installdebconf dh_installdocs README dh_buildinfo dh_installexamples debian/lilo.conf debian/grub-menu.lst diff -u memtest86-3.5/debian/grub memtest86-3.5/debian/grub --- memtest86-3.5/debian/grub +++ memtest86-3.5/debian/grub @@ -1,13 +1,24 @@ #!/bin/sh set -e -. /usr/lib/grub/update-grub_lib if test -e /boot/memtest86.bin ; then + if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then + . /usr/lib/grub/grub-mkconfig_lib + LX=linux16 + elif [ -f /usr/lib/grub/update-grub_lib ]; then + . /usr/lib/grub/update-grub_lib + LX=linux + else + # no grub file, so we notify and exit gracefully + echo "Cannot find grub config file, exiting." >&2 + exit 0 + fi + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86.bin" ) echo "Found memtest86 image: $MEMTESTPATH" >&2 cat << EOF menuentry "Memory test (memtest86)" { - linux $MEMTESTPATH + $LX $MEMTESTPATH } EOF fi only in patch2: unchanged: --- memtest86-3.5.orig/debian/config +++ memtest86-3.5/debian/config @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_input medium shared/memtest86-run-lilo || true +db_go || true + +#DEBHELPER# only in patch2: unchanged: --- memtest86-3.5.orig/debian/templates +++ memtest86-3.5/debian/templates @@ -0,0 +1,7 @@ +Template: shared/memtest86-run-lilo +Type: boolean +Default: false +_Description: Run lilo automatically after upgrade (if found)? + If lilo is installed and its configuration file contains the + memtest86/memtest86+ image, then it should be re-run in order to + allow booting the new image. only in patch2: unchanged: --- memtest86-3.5.orig/debian/lintian-overrides +++ memtest86-3.5/debian/lintian-overrides @@ -0,0 +1,2 @@ +# This file is intended to be statically-linked +memtest86: statically-linked-binary ./usr/lib/memtest86/memtest86.elf only in patch2: unchanged: --- memtest86-3.5.orig/debian/po/POTFILES.in +++ memtest86-3.5/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates only in patch2: unchanged: --- memtest86-3.5.orig/debian/po/templates.pot +++ memtest86-3.5/debian/po/templates.pot @@ -0,0 +1,32 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <em...@address>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: memtest...@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <em...@address>\n" +"Language-Team: LANGUAGE <l...@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr ""
