Merge version 157+rpi1 and 158 to produce 158+rpi1

diff --cc debian/changelog
index f85fce2c43ad50722f8025a36b6297043558f6bf,63ed3eb0690c284c4faf97d7a6228b5cc3d07967..f1151fcc0107204fa002dd37c83dcfa9b1660433
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
- partman-basicfilesystems (157+rpi1) bookworm-staging; urgency=medium
++partman-basicfilesystems (158+rpi1) bookworm-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>  Sun, 12 Jun 2022 11:55:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Aug 2022 02:59:03 +0000
++
+ partman-basicfilesystems (158) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Updated translations ]
+   * Basque (eu.po) by Gontzal Manuel Pujana Onaindia
+   * Vietnamese (vi.po) by Trần Ngọc Quân
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Sun, 31 Jul 2022 15:11:43 +0200
  
  partman-basicfilesystems (157) unstable; urgency=medium