Merge version 154+rpi1 and 155 to produce 155+rpi1

diff --cc debian/changelog
index e51b63359b2b97153549aa37321ba9c984389416,694a7f99e28c8c75e7b54274bec9d83b4bcdaf4b..a3379b97aacea69358796765d07519be1e20f1ad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- partman-basicfilesystems (154+rpi1) bullseye-staging; urgency=medium
++partman-basicfilesystems (155+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 97+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 21:59:02 +0000]
 +  * Remove fat-modules and ext2-modules dependencies as Raspbian
 +    kernels have the support built in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 01 Mar 2021 14:22:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 19:51:34 +0000
++
+ partman-basicfilesystems (155) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Updated translations ]
+   * Arabic (ar.po) by Fahim Sabah
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Sun, 30 May 2021 23:29:53 +0200
  
  partman-basicfilesystems (154) unstable; urgency=medium