Merge version 1:0.1.114-2+rpi1 and 1:0.1.118-2 to produce 1:0.1.118-2+rpi1

diff --cc babl/meson.build
Simple merge

diff --cc debian/changelog
index d198665f428ae57df4b98aad5373b652d9b11f50,3d5e685c54fa4c272486499df9604aa528d20ace..d814e59071aa32573b5929ab0e8d46ec7e074930
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,40 +1,48 @@@
- babl (1:0.1.114-2+rpi1) trixie-staging; urgency=medium
++babl (1:0.1.118-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1:0.1.92-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 27 Aug 2022 09:54:36 +0000]
 +  * Disable neon support, it seems to assume armv8 neon which not
 +    all systems have.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Jun 2025 00:13:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Jan 2026 09:53:47 +0000
++
+ babl (1:0.1.118-2) unstable; urgency=medium
+ 
+   * Move Maintainer from Debian GNOME to Debian GNOME Extras
+   * Support nodoc build profile
+   * Bump Standards Version to 4.7.3
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Thu, 08 Jan 2026 09:45:44 -0500
+ 
+ babl (1:0.1.118-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Cherry-pick patch to fix build
+   * Remove unnecessary Priority: optional field
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Sat, 13 Dec 2025 21:02:40 -0500
+ 
+ babl (1:0.1.116-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * debian/watch: Convert to Version: 5
+ 
+  -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 06 Oct 2025 23:08:07 -0400
+ 
+ babl (1:0.1.114-3) unstable; urgency=medium
+ 
+   * Team upload
+   * d/control: Replace libgirepository1.0-dev B-D with
+     gobject-introspection
+   * d/control, d/rules: Only run gi-docgen when building Architecture: all
+   * d/libbabl-doc.links: Register API reference with devhelp
+   * d/copyright: Stop quoting the FSF's former postal address here
+   * d/control: Remove unnecessary B-D on python3-setuptools
+   * d/salsa-ci.yml: Add
+   * d/control: Remove Rules-Requires-Root, unnecessary since trixie
+   * d/control: Standards-Version: 4.7.2 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Mon, 08 Sep 2025 09:18:33 +0100
  
  babl (1:0.1.114-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 6e758690e378e966b9732fd5b3d68b0763277fb0,b4660933a7844f329738b3dae234f3dc3320c053..6aafbd356164a3b7469c53fcd458d477c403cce7
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
  tests-increase-timeout.patch
+ meson-Check-for-repository-with-python-not-git-executable.patch
 +disable-neon.patch

diff --cc meson.build
Simple merge