-
--- 5.01-3.1/debian/po/zh_HK.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/zh_HK.po 2019-08-16 04:13:11.000000000 +0000
@@ -31,3 +31,19 @@ msgid ""
msgstr ""
"如果安裝了 lilo 且其設定檔中包含 memtest86/memtest86+ 鏡像,則應當重新執行它"
"才能啟動新的鏡像。"
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/pt.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/pt.po 2019-08-16 04:13:11.000000000 +0000
@@ -35,3 +35,19 @@ msgstr ""
"Se o lilo estiver instalado e o seu ficheiro de configuração conter a imagem "
"memtest86/memtest86+, então deve ser re-executado de modo a permitir o "
"arranque pela nova imagem."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/rules 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/rules 2019-08-16 04:13:11.000000000 +0000
@@ -15,6 +15,9 @@ endif
$(MAKE) memtest.bin memtest
./makeiso.sh
+ ls debian/po --hide *.pot --hide *.in | sed 's/\.po//g' | xargs -I {} -t sh -c \
+ "mkdir -p debian/locale/{}/LC_MESSAGES/ && \
+ msgfmt debian/po/{}.po -o debian/locale/{}/LC_MESSAGES/memtest86+.mo"
touch build-stamp
clean:
@@ -25,7 +28,7 @@ clean:
[ ! -f Makefile ] || $(MAKE) clean
# make sure PO files are always up-to-date
- debconf-updatepo
+ debconf-updatepo --skip-pot
dh_clean
@@ -37,7 +40,9 @@ install: build
install -d debian/$(PACKAGE)/usr/bin
install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin
- install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf
+ install -D -m644 memtest debian/$(PACKAGE)/boot/$(PACKAGE).elf
+ install -d debian/$(PACKAGE)/usr/lib/$(PACKAGE)
+ ln -sf /boot/$(PACKAGE).elf debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf
install -D -m644 mt*.iso debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).iso
install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin
install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE)
@@ -45,6 +50,7 @@ install: build
install -d debian/$(PACKAGE)/usr/share/lintian/overrides
install -m644 debian/lintian-overrides \
debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)
+ mv debian/locale debian/$(PACKAGE)/usr/share
# Build architecture-independent files here.
binary-indep: build install
-
--- 5.01-3.1/debian/control 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/control 2019-08-16 04:13:11.000000000 +0000
@@ -1,7 +1,8 @@
Source: memtest86+
Section: misc
Priority: optional
-Maintainer: Yann Dirson <dirson@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Yann Dirson <dirson@debian.org>
Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64],
po-debconf, genisoimage
Homepage: http://www.memtest.org/
-
--- 5.01-3.1/debian/grub 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/grub 2019-08-16 04:13:11.000000000 +0000
@@ -13,47 +13,61 @@ else
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 ;;
esac
+export TEXTDOMAIN=memtest86+
+
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
-if test -e /boot/memtest86+.bin ; then
- MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
+if test -e /boot/memtest86+.elf ; then
+ MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.elf" )
echo "Found memtest86+ image: $MEMTESTPATH" >&2
cat << EOF
-menuentry "Memory test (memtest86+)" {
-EOF
- printf '%s\n' "${prepare_boot_cache}"
- cat << EOF
- $LX $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200)" {
+menuentry '$(gettext_printf "Memory test (memtest86+)")' {
EOF
printf '%s\n' "${prepare_boot_cache}"
cat << EOF
- $LX $MEMTESTPATH console=ttyS0,115200n8
+ knetbsd $MEMTESTPATH
}
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}"
+if test -e /boot/memtest86+.bin ; then
+ MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
+ echo "Found memtest86+ image: $MEMTESTPATH" >&2
cat << EOF
- multiboot $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" {
+menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200)")' {
EOF
printf '%s\n' "${prepare_boot_cache}"
cat << EOF
- multiboot $MEMTESTPATH console=ttyS0,115200n8
+ $LX $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 '$(gettext_printf "Memory test (memtest86+, experimental multiboot)")' {
+#EOF
+# printf '%s\n' "${prepare_boot_cache}"
+# cat << EOF
+# multiboot $MEMTESTPATH
+#}
+#menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200, experimental multiboot)")' {
+#EOF
+# printf '%s\n' "${prepare_boot_cache}"
+# cat << EOF
+# multiboot $MEMTESTPATH console=ttyS0,115200n8
+#}
+#EOF
+#fi
-
--- 5.01-3.1/debian/po/zh_CN.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/zh_CN.po 2019-08-16 04:13:11.000000000 +0000
@@ -32,3 +32,19 @@ msgid ""
msgstr ""
"如果安装了 lilo 且其配置文件中包含 memtest86/memtest86+ 镜像,则应当重新执行"
"它才能启动新的镜像。"
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
-
--- 5.01-3.1/debian/po/zh_TW.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/zh_TW.po 2019-08-16 04:13:11.000000000 +0000
@@ -31,3 +31,19 @@ msgid ""
msgstr ""
"如果安裝了 lilo 且其設定檔中包含 memtest86/memtest86+ 鏡像,則應當重新執行它"
"才能啟動新的鏡像。"
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/templates.pot 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/templates.pot 2019-08-16 04:13:11.000000000 +0000
@@ -30,3 +30,19 @@ msgid ""
"memtest86+ image, then it should be re-run in order to allow booting the new "
"image."
msgstr ""
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/ja.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/ja.po 2019-08-16 04:13:11.000000000 +0000
@@ -33,3 +33,19 @@ msgstr ""
"lilo がインストールされていて、その設定ファイルが memtest86/memtest86+ のイ"
"メージを指定している場合は、新しいイメージを起動できるようにするために lilo "
"の再実行が必要です。"
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/it.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/it.po 2019-08-16 04:13:11.000000000 +0000
@@ -34,3 +34,19 @@ msgstr ""
"Al fine di consentire l'avvio della nuova immagine lilo deve essere eseguito "
"nuovamente, se è installato e il suo file di configurazione contiene "
"l'immagine di memtest/memtest86+."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/ru.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/ru.po 2019-08-16 04:13:11.000000000 +0000
@@ -35,3 +35,19 @@ msgid ""
msgstr ""
"Если пакет lilo установлен и его файл настройки содержит образ memtest86/"
"memtest86+, то его нужно перезапустить, чтобы стал загружаться новый образ."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/fr.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/fr.po 2019-08-16 04:13:11.000000000 +0000
@@ -36,3 +36,19 @@ msgstr ""
"Si LILO est installé et que son fichier de configuration fait référence à "
"une image de lancement de memtest86 ou memtest86+, il doit être ré-exécuté "
"afin de pouvoir utiliser la nouvelle image."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/sv.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/sv.po 2019-08-16 04:13:11.000000000 +0000
@@ -35,3 +35,19 @@ msgstr ""
"Om lilo är installerat och dess inställningar innehållet avbildningen av "
"memtest86/memtest86+ ska den köras för att systemet ska kunna startas på den "
"nya avbildningen."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/postinst 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/postinst 2020-08-18 10:23:00.000000000 +0000
@@ -12,8 +12,8 @@ if [ "$1" = configure ]; then
lilo
fi
- if [ -e /boot/grub/grub.cfg ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then
- update-grub2
+ if [ -e /boot/grub/grub.cfg ] && type update-grub >/dev/null 2>&1 && ! systemd-detect-virt --quiet --container; then
+ update-grub 3>&-
fi
fi
-
--- 5.01-3.1/debian/po/cs.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/cs.po 2019-08-16 04:13:11.000000000 +0000
@@ -33,3 +33,19 @@ msgstr ""
"Je-li lilo nainstalován a jeho konfigurační soubor obsahuje obraz memtest86/"
"memtest86+, pak by měl být znovu spuštěn, aby umožnil zavedení tohoto nového "
"obrazu."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/es.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/es.po 2019-08-16 04:13:11.000000000 +0000
@@ -56,3 +56,19 @@ msgstr ""
"Si lilo está instalado y su archivo de configuración contiene la imagen de "
"«memtest86»/«memtest86+» vuelva a ejecutar lilo para que pueda arrancar la "
"nueva imagen."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""
-
--- 5.01-3.1/debian/po/de.po 2019-08-15 17:49:09.000000000 +0000
+++ 5.01-3.1ubuntu4/debian/po/de.po 2019-08-16 04:13:11.000000000 +0000
@@ -35,3 +35,19 @@ msgstr ""
"Falls lilo installiert ist und dessen Konfigurationsdatei das memtest86/"
"memtest86+-Image enthält, dann sollte es erneut ausgeführt werden, damit das "
"Booten des neuen Images möglich ist."
+
+#: ../grub:34
+msgid "Memory test (memtest86+)"
+msgstr ""
+
+#: ../grub:40
+msgid "Memory test (memtest86+, serial console 115200)"
+msgstr ""
+
+#: ../grub:53
+msgid "Memory test (memtest86+, experimental multiboot)"
+msgstr ""
+
+#: ../grub:59
+msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
+msgstr ""