[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1016080: marked as done (buster-pu: package libreoffice/:6.1.5-3+deb10u8)

Your message dated Thu, 25 Aug 2022 20:24:33 +0100
with message-id <17b90d8facd705b290e6ec0f395736428790c474.camel@adam-barratt.org.uk>
and subject line Re: Bug#1016080: buster-pu: package libreoffice/:6.1.5-3+deb10u8
has caused the Debian Bug report #1016080,
regarding buster-pu: package libreoffice/:6.1.5-3+deb10u8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1016080: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016080
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

actually this is quite a small update for a big package. Should we
really do it (and the default change)? Or should we assume people don't
use LO from oldstable anymore and either use bullseye or the bullseye
version backported to buster?

Filing for completeness' sake, though.

[ Reason ]
Croatia will join the Eurozone on 2023-01-01. I think we should
prepare.
TODO: After (or shortly before) 2023-01-01 we then can do a point
release update to switch the default...

[ Impact ]
EUR isn't supported in .hr locale

[ Tests ]
None, ttbomk.

[ Risks ]
None. trivial, and doesn't yet affect the default

[ Checklist ]
   [x] *all* changes are documented in the d/changelog
   [x] I reviewed all changes and I approve them
   [x] attach debdiff against the package in (old)stable
   [ ] the issue is verified as fixed in unstable

This is not yet fixed in unstable, that will happen with the upload of
7.4.0 rc2 (or someting later) to it

[ Changes ]
See above. I just added the verbatim upstream commits.

Debdiff:
$ export TMPDIR=~/tmp; debdiff libreoffice_6.1.5-3+deb10u7.dsc libreoffice_6.1.5-3+deb10u8.dsc 
dpkg-source: Warnung: unsigniertes Quellpaket wird extrahiert (/home/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice_6.1.5-3+deb10u8.dsc)
diff -Nru libreoffice-6.1.5/debian/changelog libreoffice-6.1.5/debian/changelog
--- libreoffice-6.1.5/debian/changelog	2021-03-08 13:13:24.000000000 +0100
+++ libreoffice-6.1.5/debian/changelog	2022-07-26 18:54:43.000000000 +0200
@@ -1,3 +1,10 @@
+libreoffice (1:6.1.5-3+deb10u8) buster; urgency=medium
+
+  * debian/patches/hrk-euro.diff: add EUR to .hr i18n;
+    add HRK<->EUR conversion rate to Calc and the Euro Wizard
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 26 Jul 2022 18:54:43 +0200
+
 libreoffice (1:6.1.5-3+deb10u7) buster; urgency=medium
 
   * debian/patches/fix-PYTHONPATH.diff: backport upstream fix to
diff -Nru libreoffice-6.1.5/debian/patches/hrk-euro.diff libreoffice-6.1.5/debian/patches/hrk-euro.diff
--- libreoffice-6.1.5/debian/patches/hrk-euro.diff	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/hrk-euro.diff	2022-07-26 18:54:22.000000000 +0200
@@ -0,0 +1,156 @@
+From 7c4b2db21ef77b37daf234ac1ab9989234606a22 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack@redhat.com>
+Date: Fri, 22 Jul 2022 22:12:02 +0200
+Subject: Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro
+
+TODO: switch defaults before 2023-01-01 in
+i18npool/source/localedata/data/hr_HR.xml
+
+Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371
+Reviewed-by: Eike Rathke <erack@redhat.com>
+Tested-by: Jenkins
+---
+ i18npool/source/localedata/data/hr_HR.xml              |  8 ++++++++
+ officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++++++++++
+ sc/source/core/tool/interpr2.cxx                       |  3 ++-
+ 3 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml
+index 0c493131e16b..4de83e5535cd 100644
+--- a/i18npool/source/localedata/data/hr_HR.xml
++++ b/i18npool/source/localedata/data/hr_HR.xml
+@@ -421,6 +421,14 @@
+       <CurrencyName>Hrvatska Kuna</CurrencyName>
+       <DecimalPlaces>2</DecimalPlaces>
+     </Currency>
++    <!-- TODO: switch defaults before 2023-01-01 -->
++    <Currency default="false" usedInCompatibleFormatCodes="false">
++      <CurrencyID>EUR</CurrencyID>
++      <CurrencySymbol>€</CurrencySymbol>
++      <BankSymbol>EUR</BankSymbol>
++      <CurrencyName>Euro</CurrencyName>
++      <DecimalPlaces>2</DecimalPlaces>
++    </Currency>
+   </LC_CURRENCY>
+   <LC_TRANSLITERATION>
+     <Transliteration unoid="SENTENCE_CASE"/>
+diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+index a62d06512704..eda60fe6c434 100644
+--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
++++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+@@ -228,6 +228,17 @@
+         <value>3.45280</value>
+       </prop>
+     </node>
++    <node oor:name="CR20" oor:op="replace">
++      <prop oor:name="FromUnit">
++        <value>EUR</value>
++      </prop>
++      <prop oor:name="ToUnit">
++        <value>HRK</value>
++      </prop>
++      <prop oor:name="Factor">
++        <value>7.53450</value>
++      </prop>
++    </node>
+   </node>
+   <node oor:name="Calculate">
+     <node oor:name="Other">
+diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
+index 31c42a4b728a..67fcd9f787f8 100644
+--- a/sc/source/core/tool/interpr2.cxx
++++ b/sc/source/core/tool/interpr2.cxx
+@@ -3235,7 +3235,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& r
+         { "SKK", 30.1260,  2 },
+         { "EEK", 15.6466,  2 },
+         { "LVL", 0.702804, 2 },
+-        { "LTL", 3.45280,  2 }
++        { "LTL", 3.45280,  2 },
++        { "HRK", 7.53450,  2 }
+     };
+ 
+     for (const auto & i : aConvertTable)
+-- 
+cgit v1.2.1
+
+From b1a2f727ca99ecd3402d4b051b99cbfd24266e59 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack@redhat.com>
+Date: Fri, 22 Jul 2022 22:17:11 +0200
+Subject: Related: tdf#150011 Add HRK Croatian Kuna to Euro conversion wizard
+
+Maybe just for completeness, it's removed from menu but might be
+callable as macro.
+
+Change-Id: Iade0be845186d3deb2f00f4aaa230c0b344cea72
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137372
+Reviewed-by: Eike Rathke <erack@redhat.com>
+Tested-by: Jenkins
+---
+ wizards/source/euro/Init.xba                        | 16 ++++++++++++++++
+ wizards/source/resources/resources_en_US.properties |  1 +
+ 2 files changed, 17 insertions(+)
+
+diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
+index 623a0a53be46..9f56c503a347 100644
+--- a/wizards/source/euro/Init.xba
++++ b/wizards/source/euro/Init.xba
+@@ -89,6 +89,7 @@ Public sCurrSLOVAK as String
+ Public sCurrESTONIAN as String
+ Public sCurrLATVIAN as String
+ Public sCurrLITHUANIAN as String
++Public sCurrCROATIAN as String
+ 
+ Public sPrgsRETRIEVAL as String
+ Public sPrgsCONVERTING as String
+@@ -214,6 +215,7 @@ Dim LocWorkPath as String
+ 		sCurrESTONIAN = GetResText(&quot;CURRENCIES_16&quot;)
+ 		sCurrLATVIAN = GetResText(&quot;CURRENCIES_17&quot;)
+ 		sCurrLITHUANIAN = GetResText(&quot;CURRENCIES_18&quot;)
++		sCurrCROATIAN = GetResText(&quot;CURRENCIES_19&quot;)
+ 		.cmdCancel.Label =  sCANCEL
+ 		.cmdHelp.Label =  sHELP
+ 		.cmdBack.Label =  GetResText(&quot;STEP_ZERO_2&quot;)
+@@ -393,6 +395,11 @@ Sub InitializeLanguages()
+     LangIDValue(18,0,1) = &quot;LT&quot;
+     LangIDValue(18,0,2) = &quot;-427&quot;
+ 
++&apos; CURRENCIES_CROATIAN
++    LangIDValue(19,0,0) = &quot;hr&quot;
++    LangIDValue(19,0,1) = &quot;HR&quot;
++    LangIDValue(19,0,2) = &quot;-41A&quot;
++
+ End Sub
+ 
+ 
+@@ -572,6 +579,15 @@ Dim i as Integer
+ 	CurrValue(18,4) = &quot;Lt&quot;
+ 	CurrValue(18,5) = &quot;LTL&quot;
+ 
++	CurrValue(19,0) = sCurrCROATIAN
++	&apos; real conversion rate
++	CurrValue(19,1) = 7.53450
++	&apos; rounded conversion rate
++	CurrValue(19,2) = 7.5
++	CurrValue(19,3) = &quot;kn&quot;
++	CurrValue(19,4) = &quot;kn&quot;
++	CurrValue(19,5) = &quot;HRK&quot;
++
+ 	i = -1
+ 	CurrSymbolList(0) = &quot;&quot;
+ 	CurrSymbolList(1) = &quot;&quot;
+diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
+index 32f9104e97e0..8649b2500e6a 100644
+--- a/wizards/source/resources/resources_en_US.properties
++++ b/wizards/source/resources/resources_en_US.properties
+@@ -448,6 +448,7 @@ CURRENCIES_15=Slovak Koruna
+ CURRENCIES_16=Estonian Kroon
+ CURRENCIES_17=Latvian Lats
+ CURRENCIES_18=Lithuanian Litas
++CURRENCIES_19=Croatian Kuna
+ STEP_LASTPAGE_0=Progress
+ STEP_LASTPAGE_1=Retrieving the relevant documents...
+ STEP_LASTPAGE_2=Converting the documents...
+-- 
+cgit v1.2.1
+
diff -Nru libreoffice-6.1.5/debian/patches/series libreoffice-6.1.5/debian/patches/series
--- libreoffice-6.1.5/debian/patches/series	2021-03-08 00:19:35.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/series	2022-07-26 18:54:33.000000000 +0200
@@ -66,3 +66,4 @@
 Postgresql-12-no-adsrc.diff
 glm-0.9.9-ctor.diff
 fix-PYTHONPATH.diff
+hrk-euro.diff

[ Other info ]
As said, we need a new update to switch the default later.

Regards,

Rene

--- End Message ---
--- Begin Message --- 
On Thu, 2022-08-25 at 21:21 +0200, Rene Engelhard wrote:
> Hi,
> 
> Am 25.08.22 um 21:05 schrieb Adam D. Barratt:
> > To clarify here, are you suggesting that we should skip this change
> > for
> > buster?
> 
> Yes, given that we'd need a further update even more tiny and the
> next 
> release is the final one I don't think this warrants a full
> libreoffice 
> build.
> 
> Sorry for this unneeded request.
> 
>  > (and, as you say, assume people will want to use newer versions
> in 
> any case.)
> 
> 
> Indeed.
> 
> 
> Just didn't want to close myself, but we could do so and ignore this
> for 
> buster.

No worries, thanks for clarifying and apologies for not following up
sooner.

I'll close the bug now.

Regards,

Adam

--- End Message ---
Reply to: