Merge version 117+rpi1 and 118 to produce 118+rpi1

diff --cc debian/changelog
index 346eebf2d1b928d1f81437dc0b9e1f0123e5a3d4,78806fe5581fe7995ffd6f04062b27afe5dd39be..cea4b1afa088c381d25dc05a7fed177bcd885b73
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- partman-ext3 (117+rpi1) trixie-staging; urgency=medium
++partman-ext3 (118+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 82+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Mar 2014 13:52:02 +0000]
 +  * Remove ext4-modules dependency as raspbian kernels have it built-in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Apr 2025 01:42:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jul 2025 16:41:54 +0000
++
+ partman-ext3 (118) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Uyghur (ug.po) by Abduqadir Abliz
+ 
+  -- Cyril Brulebois <kibi@debian.org>  Sun, 29 Jun 2025 14:53:31 +0200
  
  partman-ext3 (117) unstable; urgency=medium