Merge version 2024.10-1+rpi1 and 2025.1-1 to produce 2025.1-1+rpi1

diff --cc debian/changelog
index 770f8e1ab490157acd71e7d9dbac086d9cb044e2,482fc1def505d42926e7e4c18360b80cce8ccba1..91d79765fa53c3f5cee6624e92d2ea582c1a23d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- ostree (2024.10-1+rpi1) trixie-staging; urgency=medium
++ostree (2025.1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2020.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 11:54:45 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 15 Jan 2025 10:19:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Jan 2025 14:55:46 +0000
++
+ ostree (2025.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * d/libostree-1-1.symbols: Update
+   * d/control: Use ${gir:Depends}, ${gir:Provides} in -dev package
+     if available. Don't completely rely on those variables, for
+     backportability.
+ 
+  -- Simon McVittie <smcv@debian.org>  Mon, 20 Jan 2025 10:46:58 +0000
  
  ostree (2024.10-1) unstable; urgency=medium