From: Raspbian automatic forward porter Date: Thu, 25 Jun 2020 09:25:47 +0000 (+0100) Subject: Merge version 4.0.4-5+rpi2 and 4.0.4-5.1 to produce 4.0.4-5.1+rpi1 X-Git-Tag: archive/raspbian/4.0.4-5.1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=40c4980dce68b70739eba89418e94469030ed697;p=zimlib.git Merge version 4.0.4-5+rpi2 and 4.0.4-5.1 to produce 4.0.4-5.1+rpi1 --- 40c4980dce68b70739eba89418e94469030ed697 diff --cc debian/changelog index 935247f,5f32372..34fa147 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,10 +1,22 @@@ - zimlib (4.0.4-5+rpi2) bullseye-staging; urgency=medium ++zimlib (4.0.4-5.1+rpi1) bullseye-staging; urgency=medium + ++ [changes brought forward from 4.0.4-5+rpi1 by Peter Michael Green at Fri, 18 Jan 2019 22:43:45 +0000] ++ * Update symbols file for Raspbian. ++ ++ [changes brought forward from 4.0.4-5+rpi2 by Peter Michael Green at Sun, 07 Jun 2020 17:28:23 +0000] + * Update symbols for new ICU. + * Disable testsuite. + * Fix clean target. + - -- Peter Michael Green Sun, 07 Jun 2020 17:28:23 +0000 ++ -- Raspbian forward porter Thu, 25 Jun 2020 09:25:47 +0000 + - zimlib (4.0.4-5+rpi1) buster-staging; urgency=medium + zimlib (4.0.4-5.1) unstable; urgency=medium - * Update symbols file for Raspbian. + * Non-maintainer upload. + * debian/libzim4.symbols: Mark more template instantiations as optional and + update for changes due to icu 67. (Closes: #960243) - -- Peter Michael Green Fri, 18 Jan 2019 22:43:45 +0000 + -- Sebastian Ramacher Sun, 07 Jun 2020 22:26:22 +0200 zimlib (4.0.4-5) unstable; urgency=medium diff --cc debian/libzim4.symbols index d8c7334,125cea3..7be33ae --- a/debian/libzim4.symbols +++ b/debian/libzim4.symbols @@@ -702,7 -705,7 +705,8 @@@ libzim.so.4 libzim4 #MINVER _ZTIN6Xapian13DatabaseErrorE@Base 4.0.4 _ZTIN6Xapian16QueryParserErrorE@Base 4.0.4 _ZTIN6Xapian5ErrorE@Base 4.0.4 + (optional=templinst)_ZTIN6icu_6714StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 + (optional=icu64templinst)_ZTIN6icu_6314StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 (arch=armel)_ZTIN9__gnu_cxx24__concurrence_lock_errorE@Base 4.0.4 (arch=armel)_ZTIN9__gnu_cxx26__concurrence_unlock_errorE@Base 4.0.4 (arch=armel)_ZTIN9__gnu_cxx7__mutexE@Base 4.0.4 @@@ -768,7 -771,7 +772,8 @@@ _ZTSN6Xapian13DatabaseErrorE@Base 4.0.4 _ZTSN6Xapian16QueryParserErrorE@Base 4.0.4 _ZTSN6Xapian5ErrorE@Base 4.0.4 + (optional=templinst)_ZTSN6icu_6714StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 + (optional=icu63templinst)_ZTSN6icu_6314StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 (arch=armel)_ZTSN9__gnu_cxx24__concurrence_lock_errorE@Base 4.0.4 (arch=armel)_ZTSN9__gnu_cxx26__concurrence_unlock_errorE@Base 4.0.4 (arch=armel)_ZTSN9__gnu_cxx7__mutexE@Base 4.0.4 @@@ -832,7 -835,7 +837,8 @@@ _ZTVN3zim6writer9LzmaErrorE@Base 4.0.4 _ZTVN3zim9Md5streamE@Base 4.0.4 _ZTVN3zim9SubBufferE@Base 4.0.4 + (optional=templinst)_ZTVN6icu_6714StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 + (optional=icu63templinst)_ZTVN6icu_6314StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 4.0.4 (arch=armel)_ZTVN9__gnu_cxx24__concurrence_lock_errorE@Base 4.0.4 (arch=armel)_ZTVN9__gnu_cxx26__concurrence_unlock_errorE@Base 4.0.4 (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4