Merge version 2.5-11+rpi1 and 2.5-11.1 to produce 2.5-11.1+rpi1

diff --cc debian/changelog
index c542fa7bfd44f3a57d8b92c256d6f06c5ee50603,c5da01619438bc81e4736b691eb66039b8931ffe..e5a4d32cb97fb2329b1778840e4c7ba9474f548f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- target-factory (2.5-11+rpi1) bookworm-staging; urgency=medium
++target-factory (2.5-11.1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Mar 2022 11:00:04 +0000]
 +  * Update symbols file for raspbian.
 +
 +  [changes brought forward from 2.5-7+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 03 Dec 2022 16:04:38 +0000]
 +  * Remove symbols that disappeard with new protobuf.
 +
 +  [changes brought forward from 2.5-7+rpi3 by Peter Michael Green <plugwash@raspbian.org> at Sat, 03 Dec 2022 20:54:31 +0000]
 +  * Really remove symbols that disappeard with new protobuf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 05 Jun 2023 04:24:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Oct 2024 09:58:52 +0000
++
+ target-factory (2.5-11.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1062967
+ 
+  -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 18:03:35 +0000
  
  target-factory (2.5-11) unstable; urgency=medium