Although the initial patchset works, I think it would be cleaner to also change the translation files so that they take into account the changes in the partition names.
I attach 2 debdiff: - util_linux_debdiff_2.patch: it can be applied on top of the first patch that was already applied. - util_linux_debdiff_complete.patch: the debdiff for all the changes, the one already applied and the new one. Sorry for that. Thanks, Alexandre Ghiti
diff -Nru util-linux-2.36.1/debian/changelog util-linux-2.36.1/debian/changelog --- util-linux-2.36.1/debian/changelog 2021-09-23 16:07:01.000000000 +0200 +++ util-linux-2.36.1/debian/changelog 2021-10-12 15:24:33.000000000 +0200 @@ -1,3 +1,9 @@ +util-linux (2.36.1-8ubuntu3) impish; urgency=medium + + * po: Update translations after changes to HiFive partition names + + -- Alexandre Ghiti <alexandre.gh...@canonical.com> Tue, 12 Oct 2021 15:24:33 +0200 + util-linux (2.36.1-8ubuntu2) impish; urgency=medium * include: Rename HiFive partition UUIDs (LP: #1944741) diff -Nru util-linux-2.36.1/debian/patches/series util-linux-2.36.1/debian/patches/series --- util-linux-2.36.1/debian/patches/series 2021-09-23 16:07:01.000000000 +0200 +++ util-linux-2.36.1/debian/patches/series 2021-10-12 15:24:33.000000000 +0200 @@ -10,3 +10,4 @@ upstream/libmount-allow-read-only-for-not-root-users.patch upstream/CVE-2021-37600-sys-utils-ipcutils-be-careful-when-call-calloc.patch hifive-guid-names.patch +ubuntu/hifive-guid-names-translations.patch diff -Nru util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch --- util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch 1970-01-01 01:00:00.000000000 +0100 +++ util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch 2021-10-12 15:23:45.000000000 +0200 @@ -0,0 +1,493 @@ +Description: Update translations after changes to HiFive partition names +Author: Alexandre Ghiti <alexandre.gh...@canonical.com> +Origin: https://github.com/karelzak/util-linux/pull/1469 +Last-Update: 2021-10-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/po/ca.po ++++ b/po/ca.po +@@ -5618,11 +5618,11 @@ + msgstr " d suprimeix una partició" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/cs.po ++++ b/po/cs.po +@@ -5391,12 +5391,12 @@ + msgstr "OddÃl Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/da.po ++++ b/po/da.po +@@ -5389,12 +5389,12 @@ + msgstr "Plan 9-partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/de.po ++++ b/po/de.po +@@ -5430,12 +5430,12 @@ + msgstr "Plan 9-Partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/es.po ++++ b/po/es.po +@@ -5309,12 +5309,12 @@ + msgstr "Partición del plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/et.po ++++ b/po/et.po +@@ -5572,11 +5572,11 @@ + msgstr " d kustutada partitsioon" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/eu.po ++++ b/po/eu.po +@@ -5524,11 +5524,11 @@ + msgstr " d Uneko partizioa ezabatu" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/fi.po ++++ b/po/fi.po +@@ -5529,11 +5529,11 @@ + msgstr "poista osio" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/fr.po ++++ b/po/fr.po +@@ -5299,12 +5299,12 @@ + msgstr "Partition Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/gl.po ++++ b/po/gl.po +@@ -5446,11 +5446,11 @@ + msgstr " d eliminar a partición BSD" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/hr.po ++++ b/po/hr.po +@@ -5378,12 +5378,12 @@ + msgstr "Plan 9 partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/hu.po ++++ b/po/hu.po +@@ -5590,11 +5590,11 @@ + msgstr " d partÃció törlése" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/id.po ++++ b/po/id.po +@@ -5590,11 +5590,11 @@ + msgstr " d hapus sebuah partisi" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/it.po ++++ b/po/it.po +@@ -5617,11 +5617,11 @@ + msgstr " d cancellazione di una partizione" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/ja.po ++++ b/po/ja.po +@@ -5281,12 +5281,12 @@ + msgstr "Plan 9 パーティション" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/nl.po ++++ b/po/nl.po +@@ -5393,11 +5393,11 @@ + msgstr "Plan-9 partitie" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/pl.po ++++ b/po/pl.po +@@ -5286,12 +5286,12 @@ + msgstr "Partycja Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -5342,12 +5342,12 @@ + msgstr "Plan 9 partição" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/pt.po ++++ b/po/pt.po +@@ -5277,12 +5277,12 @@ + msgstr "Partição Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/ru.po ++++ b/po/ru.po +@@ -5388,11 +5388,11 @@ + msgstr " d удаление раздела" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/sl.po ++++ b/po/sl.po +@@ -5608,11 +5608,11 @@ + msgstr " d zbri¹i razdelek" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/sv.po ++++ b/po/sv.po +@@ -5302,12 +5302,12 @@ + msgstr "Plan 9-partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/tr.po ++++ b/po/tr.po +@@ -5328,11 +5328,11 @@ + msgstr "Plan 9 disk bölümü" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/uk.po ++++ b/po/uk.po +@@ -5283,12 +5283,12 @@ + msgstr "Розділ Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/util-linux.pot ++++ b/po/util-linux.pot +@@ -5201,11 +5201,11 @@ + msgstr "" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/vi.po ++++ b/po/vi.po +@@ -5417,11 +5417,11 @@ + msgstr "xóa má»™t phân vùng" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -5283,12 +5283,12 @@ + msgstr "Plan 9 分区" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -5623,11 +5623,11 @@ + msgstr "刪除分割" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1
diff -Nru util-linux-2.36.1/debian/changelog util-linux-2.36.1/debian/changelog --- util-linux-2.36.1/debian/changelog 2021-08-11 23:43:10.000000000 +0200 +++ util-linux-2.36.1/debian/changelog 2021-09-23 16:07:01.000000000 +0200 @@ -1,3 +1,11 @@ +util-linux (2.36.1-8ubuntu2) impish; urgency=medium + + * Fix HiFive partition names (LP: #1944741) + - include: Rename HiFive partition UUIDs + - po: Update translations after changes to HiFive partition names + + -- Alexandre Ghiti <alexandre.gh...@canonical.com> Thu, 23 Sep 2021 16:07:01 +0200 + util-linux (2.36.1-8ubuntu1) impish; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru util-linux-2.36.1/debian/patches/series util-linux-2.36.1/debian/patches/series --- util-linux-2.36.1/debian/patches/series 2021-08-11 23:42:55.000000000 +0200 +++ util-linux-2.36.1/debian/patches/series 2021-09-23 16:07:01.000000000 +0200 @@ -9,3 +9,5 @@ upstream/libmount-do-not-canonicalize-ZFS-source-dataset.patch upstream/libmount-allow-read-only-for-not-root-users.patch upstream/CVE-2021-37600-sys-utils-ipcutils-be-careful-when-call-calloc.patch +upstream/hifive-guid-names.patch +ubuntu/hifive-guid-names-translations.patch diff -Nru util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch --- util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch 1970-01-01 01:00:00.000000000 +0100 +++ util-linux-2.36.1/debian/patches/ubuntu/hifive-guid-names-translations.patch 2021-09-23 16:07:01.000000000 +0200 @@ -0,0 +1,493 @@ +Description: Update translations after changes to HiFive partition names +Author: Alexandre Ghiti <alexandre.gh...@canonical.com> +Origin: https://github.com/karelzak/util-linux/pull/1469 +Last-Update: 2021-10-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/po/ca.po ++++ b/po/ca.po +@@ -5618,11 +5618,11 @@ + msgstr " d suprimeix una partició" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/cs.po ++++ b/po/cs.po +@@ -5391,12 +5391,12 @@ + msgstr "OddÃl Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/da.po ++++ b/po/da.po +@@ -5389,12 +5389,12 @@ + msgstr "Plan 9-partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/de.po ++++ b/po/de.po +@@ -5430,12 +5430,12 @@ + msgstr "Plan 9-Partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/es.po ++++ b/po/es.po +@@ -5309,12 +5309,12 @@ + msgstr "Partición del plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/et.po ++++ b/po/et.po +@@ -5572,11 +5572,11 @@ + msgstr " d kustutada partitsioon" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/eu.po ++++ b/po/eu.po +@@ -5524,11 +5524,11 @@ + msgstr " d Uneko partizioa ezabatu" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/fi.po ++++ b/po/fi.po +@@ -5529,11 +5529,11 @@ + msgstr "poista osio" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/fr.po ++++ b/po/fr.po +@@ -5299,12 +5299,12 @@ + msgstr "Partition Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/gl.po ++++ b/po/gl.po +@@ -5446,11 +5446,11 @@ + msgstr " d eliminar a partición BSD" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/hr.po ++++ b/po/hr.po +@@ -5378,12 +5378,12 @@ + msgstr "Plan 9 partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/hu.po ++++ b/po/hu.po +@@ -5590,11 +5590,11 @@ + msgstr " d partÃció törlése" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/id.po ++++ b/po/id.po +@@ -5590,11 +5590,11 @@ + msgstr " d hapus sebuah partisi" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/it.po ++++ b/po/it.po +@@ -5617,11 +5617,11 @@ + msgstr " d cancellazione di una partizione" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/ja.po ++++ b/po/ja.po +@@ -5281,12 +5281,12 @@ + msgstr "Plan 9 パーティション" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/nl.po ++++ b/po/nl.po +@@ -5393,11 +5393,11 @@ + msgstr "Plan-9 partitie" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/pl.po ++++ b/po/pl.po +@@ -5286,12 +5286,12 @@ + msgstr "Partycja Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -5342,12 +5342,12 @@ + msgstr "Plan 9 partição" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/pt.po ++++ b/po/pt.po +@@ -5277,12 +5277,12 @@ + msgstr "Partição Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/ru.po ++++ b/po/ru.po +@@ -5388,11 +5388,11 @@ + msgstr " d удаление раздела" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/sl.po ++++ b/po/sl.po +@@ -5608,11 +5608,11 @@ + msgstr " d zbri¹i razdelek" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/sv.po ++++ b/po/sv.po +@@ -5302,12 +5302,12 @@ + msgstr "Plan 9-partition" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/tr.po ++++ b/po/tr.po +@@ -5328,11 +5328,11 @@ + msgstr "Plan 9 disk bölümü" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/uk.po ++++ b/po/uk.po +@@ -5283,12 +5283,12 @@ + msgstr "Розділ Plan 9" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "FSBL HiFive Unleashed" ++msgid "HiFive FSBL" ++msgstr "FSBL HiFive" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "BBL HiFive Unleashed" ++msgid "HiFive BBL" ++msgstr "BBL HiFive" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/util-linux.pot ++++ b/po/util-linux.pot +@@ -5201,11 +5201,11 @@ + msgstr "" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/vi.po ++++ b/po/vi.po +@@ -5417,11 +5417,11 @@ + msgstr "xóa má»™t phân vùng" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -5283,12 +5283,12 @@ + msgstr "Plan 9 分区" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" +-msgstr "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" ++msgstr "HiFive FSBL" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" +-msgstr "HiFive Unleashed BBL" ++msgid "HiFive BBL" ++msgstr "HiFive BBL" + + #: include/pt-mbr-partnames.h:1 + msgid "Empty" +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -5623,11 +5623,11 @@ + msgstr "刪除分割" + + #: include/pt-gpt-partnames.h:169 +-msgid "HiFive Unleashed FSBL" ++msgid "HiFive FSBL" + msgstr "" + + #: include/pt-gpt-partnames.h:170 +-msgid "HiFive Unleashed BBL" ++msgid "HiFive BBL" + msgstr "" + + #: include/pt-mbr-partnames.h:1 diff -Nru util-linux-2.36.1/debian/patches/upstream/hifive-guid-names.patch util-linux-2.36.1/debian/patches/upstream/hifive-guid-names.patch --- util-linux-2.36.1/debian/patches/upstream/hifive-guid-names.patch 1970-01-01 01:00:00.000000000 +0100 +++ util-linux-2.36.1/debian/patches/upstream/hifive-guid-names.patch 2021-09-23 16:07:01.000000000 +0200 @@ -0,0 +1,25 @@ +Description: Rename HiFive partition UUIDs +Both HiFive Unleashed and HiFive Unmatched bootloaders seek for the same +UUIDs to load the next stage bootloader: the current name makes partitions +on Unmatched board appear as 'Unleashed'. + +Fix that by removing the 'Unleashed' part of the current name so that it +fits both. +Author: Alexandre Ghiti <alexandre.gh...@canonical.com> +Origin: upstream, https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07 +Applied-Upstream: https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07 +Last-Update: 2021-09-23 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/include/pt-gpt-partnames.h ++++ b/include/pt-gpt-partnames.h +@@ -165,6 +165,6 @@ + /* Plan 9 */ + DEF_GUID("C91818F9-8025-47AF-89D2-F030D7000C2C", N_("Plan 9 partition")), + +-/* HiFive Unleased bootloaders */ +-DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive Unleashed FSBL")), +-DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive Unleashed BBL")), ++/* HiFive bootloaders */ ++DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive FSBL")), ++DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive BBL")),
