diff -Nru zimlib-6.1.7/debian/changelog zimlib-6.1.7/debian/changelog --- zimlib-6.1.7/debian/changelog 2020-07-07 23:38:35.000000000 +0000 +++ zimlib-6.1.7/debian/changelog 2020-07-18 02:37:09.000000000 +0000 @@ -1,3 +1,14 @@ +zimlib (6.1.7-2+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] + * Disable testsuite. + * Fix clean target. + + -- Raspbian forward porter Sat, 18 Jul 2020 02:37:09 +0000 + zimlib (6.1.7-2) unstable; urgency=medium * Upload to unstable diff -Nru zimlib-6.1.7/debian/libzim6.symbols zimlib-6.1.7/debian/libzim6.symbols --- zimlib-6.1.7/debian/libzim6.symbols 2020-07-07 23:36:12.000000000 +0000 +++ zimlib-6.1.7/debian/libzim6.symbols 2020-07-18 02:37:09.000000000 +0000 @@ -865,29 +865,29 @@ (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 6.0.2 _ZTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 6.0.2 (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel armhf)_ZTISt14default_deleteIKN3zim6ReaderEE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 6.0.2 (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 _ZTISt23enable_shared_from_thisIN3zim6BufferEE@Base 6.0.2 _ZTIZN3zim6writer7Cluster9_compressI8ZIP_INFOEEvvEUlRKNS_4BlobEE_@Base 6.1.3 _ZTIZN3zim6writer7Cluster9_compressI9LZMA_INFOEEvvEUlRKNS_4BlobEE_@Base 6.1.3 @@ -939,29 +939,29 @@ (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 6.0.2 _ZTSNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 6.0.2 (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 _ZTSSt14default_deleteIKN3zim6ReaderEE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 _ZTSSt19_Sp_make_shared_tag@Base 6.0.2 (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 _ZTSSt23enable_shared_from_thisIN3zim6BufferEE@Base 6.0.2 _ZTSZN3zim6writer7Cluster9_compressI8ZIP_INFOEEvvEUlRKNS_4BlobEE_@Base 6.1.3 _ZTSZN3zim6writer7Cluster9_compressI9LZMA_INFOEEvvEUlRKNS_4BlobEE_@Base 6.1.3 @@ -1008,23 +1008,23 @@ (arch=armel riscv64)_ZTVN9__gnu_cxx24__concurrence_lock_errorE@Base 6.0.2 (arch=armel riscv64)_ZTVN9__gnu_cxx26__concurrence_unlock_errorE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim10FileReaderELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim10MMapBufferELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim12FileCompoundELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim12MemoryBufferILb1EEELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim7ClusterELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN3zim8FileImplELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt19_Sp_counted_deleterIPKN3zim6ReaderESt14default_deleteIS2_ESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIKN3zim6DirentESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.2 - (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 + (optional=notarmelandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIN3zim9SubBufferESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.2 _ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 6.0.2 #MISSING: 6.1.3# (c++)"virtual thunk to zim::Md5stream::~Md5stream()@Base" 6.0.2 #MISSING: 6.1.3# (c++)"virtual thunk to zim::Tee::~Tee()@Base" 6.0.2 diff -Nru zimlib-6.1.7/debian/rules zimlib-6.1.7/debian/rules --- zimlib-6.1.7/debian/rules 2020-06-03 09:07:14.000000000 +0000 +++ zimlib-6.1.7/debian/rules 2020-07-18 02:37:09.000000000 +0000 @@ -5,3 +5,10 @@ export SKIP_BIG_MEMORY_TEST=1 %: dh $@ --with pkgkde_symbolshelper --buildsystem=meson + +override_dh_auto_test: + echo testsuite disabled + +override_dh_auto_clean: + rm -rf test/pytest/__pycache__ + dh_auto_clean