Merge version 2.5.0-4+rpi1 and 2.5.0-5 to produce 2.5.0-5+rpi1

diff --cc debian/changelog
index ab99bb58330daf791c8ec9ac412a2bddc1dd6854,e066157309c8fe438adb41541372f174bdd70128..62c74d3f2152c97c825d5e8ef99c87e5977d6a58
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- mpdecimal (2.5.0-4+rpi1) bullseye-staging; urgency=medium
++mpdecimal (2.5.0-5+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 2.5.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Aug 2020 02:50:40 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Aug 2020 02:50:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Dec 2020 10:57:10 +0000
++
+ mpdecimal (2.5.0-5) unstable; urgency=medium
+ 
+   * Mark some symbols as optional. (Helmut Grohne). Closes: #970735.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 08 Dec 2020 10:16:04 +0100
+ 
+ mpdecimal (2.5.0-4ubuntu1) groovy; urgency=medium
+ 
+   * Mark a symbol as optional, not seen on s390x z12.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Fri, 07 Aug 2020 14:06:04 +0200
  
  mpdecimal (2.5.0-4) unstable; urgency=medium
  

diff --cc debian/libmpdec.symbols.in
index a90c9157bcc5bbb0b759cb521ef6ca1f77d53dc7,219ab70e7224006147e73fa9bf559b89e6cf8b23..f2de240123fd8aef4b9c4305a271f918ca89f28c
--- 1/debian/libmpdec.symbols.in
--- 2/debian/libmpdec.symbols.in
+++ b/debian/libmpdec.symbols.in
@@@ -423,17 -423,17 +423,16 @@@ libmpdec++.so.2 libmpdec2 #MINVER
   _ZNK7decimal16DecimalException4whatEv@Base 2.5
   _ZNK7decimal7Context4reprB5cxx11Ev@Base 2.5
   _ZNK7decimal7Decimal4reprB5cxx11Eb@Base 2.5
-  (arch=!ia64 !ppc64el !kfreebsd-amd64 !kfreebsd-i386)_ZNK7decimal7Decimal6to_sciB5cxx11Eb@Base 2.5
-  (arch=ia64)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv@Base 2.5
+  (optional=inline)_ZNK7decimal7Decimal6to_sciB5cxx11Eb@Base 2.5
+  (optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv@Base 2.5
 - (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv@Base 2.5
 - (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv@Base 2.5
 - (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info@Base 2.5
 - (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED0Ev@Base 2.5
 - (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED1Ev@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED0Ev@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED1Ev@Base 2.5
-  (arch=ia64)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED2Ev@Base 2.5
-  (arch=ia64)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag@Base 2.5
-  _ZTHN7decimal7contextE@Base 2.5
+  (optional=templinst)_ZNSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EED2Ev@Base 2.5
+  (optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag@Base 2.5
   _ZTHN7decimal7contextE@Base 2.5
 - _ZTHN7decimal7contextE@Base 2.5
   _ZTIN7decimal10ValueErrorE@Base 2.5
   _ZTIN7decimal11MallocErrorE@Base 2.5
   _ZTIN7decimal12RuntimeErrorE@Base 2.5
@@@ -450,13 -450,13 +449,13 @@@
   _ZTIN7decimal8OverflowE@Base 2.5
   _ZTIN7decimal9SubnormalE@Base 2.5
   _ZTIN7decimal9UnderflowE@Base 2.5
 - (optional=templinst)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 - (optional=templinst)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 - (optional=templinst)_ZTISt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
-  (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 2.5
-  (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
-  (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
-  (arch=armel riscv64)_ZTISt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTIN9__gnu_cxx7__mutexE@Base 2.5
+  (optional=templinst)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTISt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
   (arch=armhf)_ZTIZN7decimal4util9shared_cpEPKcEUlS2_E_@Base 2.5
   _ZTSN7decimal10ValueErrorE@Base 2.5
   _ZTSN7decimal11MallocErrorE@Base 2.5
@@@ -474,13 -474,13 +473,13 @@@
   _ZTSN7decimal8OverflowE@Base 2.5
   _ZTSN7decimal9SubnormalE@Base 2.5
   _ZTSN7decimal9UnderflowE@Base 2.5
 - (optional=templinst)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 - (optional=templinst)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 - (optional=templinst)_ZTSSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 2.5
-  (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 2.5
-  (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
-  (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
-  (arch=armel riscv64)_ZTSSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTSN9__gnu_cxx7__mutexE@Base 2.5
+  (optional=templinst)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
+  (optional=templinst)_ZTSSt19_Sp_counted_deleterIPKcZN7decimal4util9shared_cpES1_EUlS1_E_SaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 2.5
   _ZTSZN7decimal4util9shared_cpEPKcEUlS2_E_@Base 2.5
   _ZTVN7decimal10ValueErrorE@Base 2.5
   _ZTVN7decimal11MallocErrorE@Base 2.5