Bug#926891: unblock: libreoffice/1:6.1.5-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libreoffice
I think we should update busters (via sid...) LibreOffice with the new Japanese era.
This is just applying the upstream fix from
https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-6-1&id=39de7d73fdab86a1531f19076ab1d07fcff97b55
Diff:
diff -Nru libreoffice-6.1.5/debian/changelog libreoffice-6.1.5/debian/changelog
--- libreoffice-6.1.5/debian/changelog 2019-04-03 13:19:34.000000000 +0200
+++ libreoffice-6.1.5/debian/changelog 2019-04-03 13:19:34.000000000 +0200
@@ -1,3 +1,10 @@
+libreoffice (1:6.1.5-3) unstable; urgency=medium
+
+ * debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou
+ era 'Reiwa', from libreoffice-6-1 branch
+
+ -- Rene Engelhard <rene@debian.org> Wed, 03 Apr 2019 13:19:34 +0200
+
libreoffice (1:6.1.5-2) unstable; urgency=medium
* debian/patches/mention-java-common-package.diff: update message to
diff -Nru libreoffice-6.1.5/debian/patches/jp-JP-Reiwa.diff libreoffice-6.1.5/debian/patches/jp-JP-Reiwa.diff
--- libreoffice-6.1.5/debian/patches/jp-JP-Reiwa.diff 1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/jp-JP-Reiwa.diff 2019-04-03 13:19:34.000000000 +0200
@@ -0,0 +1,89 @@
+From 39de7d73fdab86a1531f19076ab1d07fcff97b55 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack@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 <erack@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 <erack@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-6.1.5/debian/patches/series libreoffice-6.1.5/debian/patches/series
--- libreoffice-6.1.5/debian/patches/series 2019-04-03 13:19:34.000000000 +0200
+++ libreoffice-6.1.5/debian/patches/series 2019-04-03 13:19:34.000000000 +0200
@@ -49,3 +49,4 @@
apparmor-opencl.diff
tdf123077.diff
java.vendor-Debian.diff
+jp-JP-Reiwa.diff
unblock libreoffice/1:6.1.5-3
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing')
Architecture: arm64 (aarch64)
Kernel: Linux 4.19.0-4-arm64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_CRAP
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: