Merge version 1.216+rpi1 and 1.217 to produce 1.217+rpi1

diff --cc debian/changelog
index 106645c65294cdfe79c450eccfcc768bd5b954d2,6e76cef965bb789eeb9788177a3ed7405eddb283..81e9f889f1852785835cc89974c81b1ea2615019
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- base-installer (1.216+rpi1) trixie-staging; urgency=medium
++base-installer (1.217+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Sep 2023 06:04:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2024 19:52:07 +0000
++
+ base-installer (1.217) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Samuel Thibault ]
+   * Add hurd-amd64 case.
+ 
+   [ Updated translations ]
+   * Catalan (ca.po) by d
+   * Marathi (mr.po) by omwani
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Thu, 04 Jan 2024 20:39:47 +0100
  
  base-installer (1.216) unstable; urgency=medium