Merge version 1.0.4-5-2+rpi1 and 1.0.4-5-3 to produce 1.0.4-5-3+rpi1

diff --cc debian/changelog
index bbb3ea488f2ae772f714ce1e9c06caf175f8996c,295a759cc99dc1c1a351f7fdc7a9dd8e03850b72..0bd4489a6e1b47334ccf9c1a76ee2571a181ca82
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- libappimage (1.0.4-5-2+rpi1) trixie-staging; urgency=medium
++libappimage (1.0.4-5-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.4-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Jan 2023 09:17:08 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Oct 2023 04:22:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Dec 2023 03:20:49 +0000
++
+ libappimage (1.0.4-5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files from the logs of buildds.
+   * Mark the internal boost-related symbols as optional, as they can change
+     depending on the boost version.
+ 
+  -- Pino Toscano <pino@debian.org>  Tue, 19 Dec 2023 18:16:16 +0100
  
  libappimage (1.0.4-5-2) unstable; urgency=medium
  

diff --cc debian/libappimage1.0abi1.symbols
index e4cc2f26dc266712c501839b12db0ac93bb902d5,04ddc3a24602bac930ead39999e485ad6f4d18de..5f86403a975e3de93eca8bb0e2a46d725968df8d
--- 1/debian/libappimage1.0abi1.symbols
--- 2/debian/libappimage1.0abi1.symbols
+++ b/debian/libappimage1.0abi1.symbols
@@@ -576,27 -583,28 +583,28 @@@ libappimage.so.1.0abi1 libappimage1.0ab
   _ZTIN8appimage5utils19IconHandleCairoRsvgE@ABI_1.0_1 1.0.3
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   _ZTIZN8appimage5utils6Logger4PrivC4EvEUlNS0_8LogLevelERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE_@ABI_1.0_1 1.0.3
-  (arch=!armel !armhf)_ZTSN5boost6system12system_errorE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTSN5boost6system14error_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTSN5boost6system6detail12std_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTSN5boost6system6detail21system_error_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTSN5boost6system6detail22generic_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system12system_errorE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system14error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system6detail12std_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system6detail21system_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system6detail22generic_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTSN5boost6system6detail22interop_error_categoryE@ABI_1.0_1 1.0.4-5
   _ZTSN8XdgUtils12DesktopEntry17DesktopEntryErrorE@ABI_1.0_1 1.0.3
   _ZTSN8XdgUtils12DesktopEntry7BadCastE@ABI_1.0_1 1.0.3
   _ZTSN8appimage19desktop_integration10integrator10IntegratorE@ABI_1.0_1 1.0.3
@@@ -623,28 -631,29 +631,29 @@@
   _ZTSN8appimage5utils19IconHandleCairoRsvgE@ABI_1.0_1 1.0.3
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   _ZTSZN8appimage5utils6Logger4PrivC4EvEUlNS0_8LogLevelERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE_@ABI_1.0_1 1.0.3
   _ZTTN8appimage4core4impl14PayloadIStreamE@ABI_1.0_1 1.0.3
-  (arch=!armel !armhf)_ZTVN5boost6system12system_errorE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTVN5boost6system14error_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTVN5boost6system6detail12std_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTVN5boost6system6detail21system_error_categoryE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZTVN5boost6system6detail22generic_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system12system_errorE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system14error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system6detail12std_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system6detail21system_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system6detail22generic_error_categoryE@ABI_1.0_1 1.0.4
+  (optional)_ZTVN5boost6system6detail22interop_error_categoryE@ABI_1.0_1 1.0.4-5
   _ZTVN8appimage19desktop_integration10integrator10IntegratorE@ABI_1.0_1 1.0.3
   _ZTVN8appimage19desktop_integration10integrator21DesktopEntryEditErrorE@ABI_1.0_1 1.0.3
   _ZTVN8appimage19desktop_integration11ThumbnailerE@ABI_1.0_1 1.0.3
@@@ -666,27 -675,27 +675,27 @@@
   _ZTVN8appimage5utils15IconHandleErrorE@ABI_1.0_1 1.0.3
   _ZTVN8appimage5utils19IconHandleCairoRsvgE@ABI_1.0_1 1.0.3
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage19desktop_integration18IntegrationManager7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage4core15PayloadIterator7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType1ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage4core4impl14TraversalType2ELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage4core8AppImage7PrivateELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN8appimage5utils18ResourcesExtractor4PrivELN9__gnu_cxx12_Lock_policyE2EE@ABI_1.0_1 1.0.4
   (arch=armel riscv64)_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system15system_categoryEvE24system_category_instance@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system16generic_categoryEvE25generic_category_instance@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE15system_instance@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE16generic_instance@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE4map_@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE7map_mx_@ABI_1.0_1 1.0.4
-  (arch=!armel !armhf)_ZZN5boost6system6detail16is_generic_valueEiE3gen@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system15system_categoryEvE24system_category_instance@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system16generic_categoryEvE25generic_category_instance@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE15system_instance@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE16generic_instance@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE4map_@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system6detail15to_std_categoryERKNS0_14error_categoryEE7map_mx_@ABI_1.0_1 1.0.4
+  (optional)_ZZN5boost6system6detail16is_generic_valueEiE3gen@ABI_1.0_1 1.0.4
   _ZZN8appimage19desktop_integration10integrator10Integrator4Priv11deployIconsEvE11dirIconPathB5cxx11@ABI_1.0_1 1.0.3
-  (optional=templinst)_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@ABI_1.0_1 1.0.3
+  (optional=templinst|arch=!amd64 !i386 !riscv64)_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@ABI_1.0_1 1.0.3
   appimage_create_thumbnail@ABI_1.0_1 0.1.6
   appimage_extract_file_following_symlinks@ABI_1.0_1 0.1.6
   appimage_get_elf_size@ABI_1.0_1 0.1.6