Merge version 21.12.2-3+rpi1 and 21.12.3-1 to produce 21.12.3-1+rpi1

diff --cc debian/changelog
index 3cb94d44681df1d8751fc2fe186930f6064f402e,ca3c755bd71b750119c933eec89bfeab69476489..641025f37b55fa430f346ef260a1d8323e373993
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- kpmcore (21.12.2-3+rpi1) bookworm-staging; urgency=medium
++kpmcore (21.12.3-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 20.12.2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Feb 2021 15:11:08 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Feb 2022 07:12:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Mar 2022 09:12:48 +0000
++
+ kpmcore (21.12.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update symbols file from the logs of buildds.
+   * CI: enable blhc, as it should work fine now.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.16.0
+   * Remove the unused ${shlibs:Depends} substvar from libkpmcore-dev.
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 07 Mar 2022 07:56:22 +0100
  
  kpmcore (21.12.2-3) unstable; urgency=medium
  

diff --cc debian/libkpmcore11.symbols
index 515b911bf9aa730d624d9b0f32897a6e9c357a95,bb7a9088dba016426e95161bc24b3b99bbaf97c5..9ab2b7c6bd8528b0677f06de1f31dc8ae4a12211
--- 1/debian/libkpmcore11.symbols
--- 2/debian/libkpmcore11.symbols
+++ b/debian/libkpmcore11.symbols
@@@ -1387,14 -1388,14 +1388,14 @@@ libkpmcore.so.11 libkpmcore11 #MINVER
   _ZTIN2FS8reiserfsE@Base 21.12.1
   _ZTIN2FS9bitlockerE@Base 21.12.1
   _ZTIN2FS9linuxswapE@Base 21.12.1
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
++ (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
++ (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
++ (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 21.12.2
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
-  (arch=armel)_ZTISt19_Sp_make_shared_tag@Base 21.12.2
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
+  (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 21.12.2
   (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
 - (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   _ZTS10DiskDevice@Base 21.12.1
   _ZTS10FileSystem@Base 21.12.1
   _ZTS10PartWidget@Base 21.12.1
@@@ -1465,14 -1466,14 +1466,14 @@@
   _ZTSN2FS8reiserfsE@Base 21.12.1
   _ZTSN2FS9bitlockerE@Base 21.12.1
   _ZTSN2FS9linuxswapE@Base 21.12.1
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
++ (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
++ (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 21.12.2
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
   _ZTSSt19_Sp_make_shared_tag@Base 21.12.1
   (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 21.12.2
 - (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 21.12.1
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceI11SmartStatusSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 20.12.2
   _ZTV10DiskDevice@Base 21.12.1
   _ZTV10FileSystem@Base 21.12.1
   _ZTV10PartWidget@Base 21.12.1