Merge version 4:22.12.0-2+rpi2 and 4:22.12.1-1 to produce 4:22.12.1-1+rpi1

diff --cc debian/changelog
index 269827189926373740a485793345c087177118f9,8ab8056e5d1831f741a736cc294b4d44dca9dd67..f6ff709cfc2130fb280672ed1c0e4e98231ceab0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,23 @@@
- marble (4:22.12.0-2+rpi2) bookworm-staging; urgency=medium
- 
-   * Remove armhf from qtwebengine architecture list in libmarble-dev
-     dependencies.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Jan 2023 16:40:02 +0000
- 
- marble (4:22.12.0-2+rpi1) bookworm-staging; urgency=medium
++marble (4:22.12.1-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:22.08.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 08 Dec 2022 15:44:12 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
 +  [changes introduced in 4:22.12.0-2+rpi1 by Peter Michael Green]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Jan 2023 11:22:46 +0000
++  [changes brought forward from 4:22.12.0-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2023 16:40:02 +0000]
++  * Remove armhf from qtwebengine architecture list in libmarble-dev
++    dependencies.
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Jan 2023 17:46:33 +0000
++
+ marble (4:22.12.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Marked libmarble-dev as Multi-Arch: same
+ 
+  -- Matthias Geiger <matthias.geiger1024@tutanota.de>  Sat, 07 Jan 2023 16:43:56 +0100
  
  marble (4:22.12.0-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge