diff -Nru libreoffice-6.0.7/debian/changelog libreoffice-6.0.7/debian/changelog --- libreoffice-6.0.7/debian/changelog 2019-02-27 20:11:27.000000000 +0900 +++ libreoffice-6.0.7/debian/changelog 2019-04-18 08:07:18.000000000 +0900 @@ -1,3 +1,12 @@ +libreoffice (1:6.0.7-0ubuntu0.18.04.6~ppa1) bionic; urgency=medium + + * debian/patches/new-japanese-era-name.patch: + Add new Japanse era name "Reiwa" support which taken from upstream: + https://cgit.freedesktop.org/libreoffice/core/commit/?id=cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb + https://cgit.freedesktop.org/libreoffice/core/commit/?id=597c5d75b8e72d429e096535334eaac7973455ef + + -- Ikuya Awashiro Thu, 18 Apr 2019 08:07:18 +0900 + libreoffice (1:6.0.7-0ubuntu0.18.04.5) bionic; urgency=medium * debian/patches/jdk-11.0.2-javadoc.diff: fix architecture-independent build diff -Nru libreoffice-6.0.7/debian/patches/new-japanese-era-name.patch libreoffice-6.0.7/debian/patches/new-japanese-era-name.patch --- libreoffice-6.0.7/debian/patches/new-japanese-era-name.patch 1970-01-01 09:00:00.000000000 +0900 +++ libreoffice-6.0.7/debian/patches/new-japanese-era-name.patch 2019-04-18 08:06:03.000000000 +0900 @@ -0,0 +1,50 @@ +Index: libreoffice-6.0.7/i18npool/source/calendar/calendar_gregorian.cxx +=================================================================== +--- libreoffice-6.0.7.orig/i18npool/source/calendar/calendar_gregorian.cxx ++++ libreoffice-6.0.7/i18npool/source/calendar/calendar_gregorian.cxx +@@ -206,10 +206,11 @@ Calendar_hanja::loadCalendar( const OUSt + } + + 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) +Index: libreoffice-6.0.7/i18npool/source/localedata/data/ja_JP.xml +=================================================================== +--- libreoffice-6.0.7.orig/i18npool/source/localedata/data/ja_JP.xml ++++ libreoffice-6.0.7/i18npool/source/localedata/data/ja_JP.xml +@@ -480,6 +480,11 @@ + + 平成 + ++ ++ Reiwa ++ ++ 令和 ++ + + + sun +Index: libreoffice-6.0.7/svl/source/numbers/zformat.cxx +=================================================================== +--- libreoffice-6.0.7.orig/svl/source/numbers/zformat.cxx ++++ libreoffice-6.0.7/svl/source/numbers/zformat.cxx +@@ -3380,6 +3380,9 @@ void SvNumberformat::ImpAppendEraG( OUSt + case 4: + cEra = 'H'; + break; ++ case 5: ++ cEra = 'R'; ++ break; + default: + cEra = '?'; + break; diff -Nru libreoffice-6.0.7/debian/patches/series libreoffice-6.0.7/debian/patches/series --- libreoffice-6.0.7/debian/patches/series 2019-02-27 20:06:45.000000000 +0900 +++ libreoffice-6.0.7/debian/patches/series 2019-04-18 08:06:50.000000000 +0900 @@ -42,3 +42,4 @@ #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff #integraltrans.diff hide-startcenter-and-maths-desktop-files.patch +new-japanese-era-name.patch