Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hi, I think we should update stables LibreOffice with the new Japanese era (and maybe even stable-updates?): This is basically the 1:6.1.5-3 fix applied 1:1 with the obvious changelog/series differences: diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog --- libreoffice-5.2.7/debian/changelog 2019-01-23 18:51:09.000000000 +0100 +++ libreoffice-5.2.7/debian/changelog 2019-04-11 21:48:53.000000000 +0200 @@ -1,3 +1,10 @@ +libreoffice (1:5.2.7-1+deb9u6) stable; urgency=medium + + * debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou + era 'Reiwa', from libreoffice-6-1 branch + + -- Rene Engelhard <r...@debian.org> Thu, 11 Apr 2019 21:48:53 +0200 + libreoffice (1:5.2.7-1+deb9u5) stretch-security; urgency=high * debian/patches/disableClassPathURLCheck.diff: add workaround to diff -Nru libreoffice-5.2.7/debian/patches/jp-JP-Reiwa.diff libreoffice-5.2.7/debian/patches/jp-JP-Reiwa.diff --- libreoffice-5.2.7/debian/patches/jp-JP-Reiwa.diff 1970-01-01 01:00:00.000000000 +0100 +++ libreoffice-5.2.7/debian/patches/jp-JP-Reiwa.diff 2019-04-11 21:48:33.000000000 +0200 @@ -0,0 +1,89 @@ +From 39de7d73fdab86a1531f19076ab1d07fcff97b55 Mon Sep 17 00:00:00 2001 +From: Eike Rathke <er...@redhat.com> +Date: Thu, 26 Jul 2018 20:46:23 +0200 +Subject: Introduce next Japanese gengou era 'Reiwa' + +Prepare for "Japan's Y2K" Gengou calendar era switch after 2019-04-30 + +The emperor Akihito will abdicate on 2019-04-30. The next emperor +will be Naruhito, but so far neither the new era name (Heisei for +Akihito) nor its abbreviation or a Unicode character are +determined. At least introduce the new era with some dummy names +(Naruhito,Na,N). + +Change-Id: I8c0af390ca0408ac259e47e7eaf2e49b5889c9ba +Reviewed-on: https://gerrit.libreoffice.org/58142 +Reviewed-by: Eike Rathke <er...@redhat.com> +Tested-by: Jenkins + +Introduce next Japanese gengou era 'Reiwa' + +starting from 2019-05-01, which has been announced officially. + +This fills the provisional slot acknowledged at +cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb. + +Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87 +Reviewed-on: https://gerrit.libreoffice.org/70157 +Reviewed-by: Eike Rathke <er...@redhat.com> +Tested-by: Jenkins +Reviewed-on: https://gerrit.libreoffice.org/70185 +--- + i18npool/source/calendar/calendar_gregorian.cxx | 9 +++++---- + i18npool/source/localedata/data/ja_JP.xml | 5 +++++ + svl/source/numbers/zformat.cxx | 3 +++ + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx +index a4ac0ac..7abef52 100644 +--- a/i18npool/source/calendar/calendar_gregorian.cxx ++++ b/i18npool/source/calendar/calendar_gregorian.cxx +@@ -205,10 +205,11 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Loc + } + + static const Era gengou_eraArray[] = { +- {1868, 1, 1, 0}, +- {1912, 7, 30, 0}, +- {1926, 12, 25, 0}, +- {1989, 1, 8, 0}, ++ {1868, 1, 1, 0}, // Meiji ++ {1912, 7, 30, 0}, // Taisho ++ {1926, 12, 25, 0}, // Showa ++ {1989, 1, 8, 0}, // Heisei ++ {2019, 5, 1, 0}, // Reiwa + {0, 0, 0, 0} + }; + Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) +diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml +index 7d75260..c15c665 100644 +--- a/i18npool/source/localedata/data/ja_JP.xml ++++ b/i18npool/source/localedata/data/ja_JP.xml +@@ -480,6 +480,11 @@ + <DefaultAbbrvName>平</DefaultAbbrvName> + <DefaultFullName>平成</DefaultFullName> + </Era> ++ <Era> ++ <EraID>Reiwa</EraID> ++ <DefaultAbbrvName>令</DefaultAbbrvName> ++ <DefaultFullName>令和</DefaultFullName> ++ </Era> + </Eras> + <StartDayOfWeek> + <DayID>sun</DayID> +diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx +index c9bd3d8..e14413c 100644 +--- a/svl/source/numbers/zformat.cxx ++++ b/svl/source/numbers/zformat.cxx +@@ -3409,6 +3409,9 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& OutString, + case 4: + cEra = 'H'; + break; ++ case 5: ++ cEra = 'R'; ++ break; + default: + cEra = '?'; + break; +-- +cgit v1.1 + diff -Nru libreoffice-5.2.7/debian/patches/series libreoffice-5.2.7/debian/patches/series --- libreoffice-5.2.7/debian/patches/series 2018-12-28 11:20:43.000000000 +0100 +++ libreoffice-5.2.7/debian/patches/series 2019-04-11 21:48:53.000000000 +0200 @@ -42,3 +42,4 @@ disableClassPathURLCheck.diff keep-pyuno-script-processing-below-base-uri.diff show-partial-signatures-even-if-cert-validation-fails.diff +jp-JP-Reiwa.diff Given https://lists.debian.org/debian-devel-announce/2018/04/msg00007.html already uploaded. (Also already fixed in sid for LibreOffice 1:6.1.5-3, filing a unblock bug for it. too) Regards, Rene