diff -Nru zimlib-4.0.4/debian/changelog zimlib-4.0.4/debian/changelog
--- zimlib-4.0.4/debian/changelog	2020-06-07 20:26:22.000000000 +0000
+++ zimlib-4.0.4/debian/changelog	2020-06-25 09:25:47.000000000 +0000
@@ -1,3 +1,15 @@
+zimlib (4.0.4-5.1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 4.0.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <plugwash@raspbian.org> at Sun, 07 Jun 2020 17:28:23 +0000]
+  * Update symbols for new ICU.
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Jun 2020 09:25:47 +0000
+
 zimlib (4.0.4-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru zimlib-4.0.4/debian/libzim4.symbols zimlib-4.0.4/debian/libzim4.symbols
--- zimlib-4.0.4/debian/libzim4.symbols	2020-06-07 20:25:05.000000000 +0000
+++ zimlib-4.0.4/debian/libzim4.symbols	2020-06-25 09:25:47.000000000 +0000
@@ -706,34 +706,35 @@
  _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
  _ZTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 4.0.4
  (arch=armel)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel armhf)_ZTISt14default_deleteIKN3zim6ReaderEE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=!amd64 !arm64 !hppa !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZTISt19_Sp_make_shared_tag@Base 4.0.4
  (arch=armel)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  _ZTISt23enable_shared_from_thisIN3zim6BufferEE@Base 4.0.4
  _ZTS13XapianIndexer@Base 4.0.4
  _ZTS16ResourceNotFound@Base 4.0.4
@@ -772,34 +773,35 @@
  _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
  _ZTSNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 4.0.4
  (arch=armel)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  _ZTSSt14default_deleteIKN3zim6ReaderEE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  _ZTSSt19_Sp_make_shared_tag@Base 4.0.4
  (arch=armel)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  _ZTSSt23enable_shared_from_thisIN3zim6BufferEE@Base 4.0.4
  _ZTTN3zim3TeeE@Base 4.0.4
  _ZTTN3zim6writer10LzmaStreamE@Base 4.0.4
@@ -836,26 +838,27 @@
  _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
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=armel)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 4.0.4
- (arch=!armel)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
+ (optional=notarmelandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 4.0.4
  (arch=amd64 arm64 armel armhf hppa i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 4.0.4
  (c++)"virtual thunk to zim::Md5stream::~Md5stream()@Base" 4.0.4
  (c++)"virtual thunk to zim::Tee::~Tee()@Base" 4.0.4
diff -Nru zimlib-4.0.4/debian/rules zimlib-4.0.4/debian/rules
--- zimlib-4.0.4/debian/rules	2018-12-19 08:53:38.000000000 +0000
+++ zimlib-4.0.4/debian/rules	2020-06-25 09:25:47.000000000 +0000
@@ -4,4 +4,7 @@
 	dh $@ --with pkgkde_symbolshelper --buildsystem=meson
 
 override_dh_auto_test:
-	SKIP_BIG_MEMORY_TEST=1 dh_auto_test -O--buildsystem=meson
+	#SKIP_BIG_MEMORY_TEST=1 dh_auto_test -O--buildsystem=meson
+
+override_dh_auto_clean:
+	rm -rf test/pytest/__pycache__