Merge version 2.3.0+ds-1+rpi1 and 2.5.1+ds-1 to produce 2.5.1+ds-1+rpi1

diff --cc debian/changelog
index a919164217e3feab200b9ba0e30b2ad488054e2f,8766efe24f01270f643787209c27e95221f837bb..9624711de2440cd863e6707a651acde981473d34
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,45 +1,52 @@@
- jacktrip (2.3.0+ds-1+rpi1) trixie-staging; urgency=medium
++jacktrip (2.5.1+ds-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 2.3.0+ds-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Jul 2024 20:22:19 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 14 Jul 2024 20:22:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 22:48:49 +0000
++
+ jacktrip (2.5.1+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 2.5.1+ds
+   * More upstream metadata
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Sun, 09 Feb 2025 22:10:08 +0100
+ 
+ jacktrip (2.5.0+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 2.5.0+ds
+     + Refresh patches
+   * Build against libsamplerate
+   * Update copyright information
+     + Update d/copyright
+     + Re-generate copyright hints
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 27 Jan 2025 17:13:40 +0100
+ 
+ jacktrip (2.4.1+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 2.4.1+ds
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Thu, 17 Oct 2024 22:33:00 +0200
+ 
+ jacktrip (2.4.0+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 2.4.0+ds
+     + Refresh patches
+   * Update copyright information
+     + Update d/copyright
+     + Update copyright-ignore-regex
+     + Re-generate d/copyright_hints
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 23 Sep 2024 00:04:20 +0200
+ 
+ jacktrip (2.3.1+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 2.3.1+ds
+   * Update copyright information
+     + Re-generate d/copyright_hints
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 19 Aug 2024 08:49:07 +0200
  
  jacktrip (2.3.0+ds-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge