Merge version 2.6.14-4+rpi1 and 2.6.14-6 to produce 2.6.14-6+rpi1

diff --cc debian/changelog
index 2e73a4027c2efd99b3dc7c34ceee92bebbb452b7,02b67428ccdf7125b6ad8857cb293e10ee3cd256..27ed5a771199c72722de2f4dcd7e82a9f948283f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,24 @@@
- gcl (2.6.14-4+rpi1) bookworm-staging; urgency=medium
++gcl (2.6.14-6+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.12-83+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 23:08:39 +0000]
 +  * Make an error message more explicit.
 +  * Use the "arm" not the "armhf" relocations code,
 +    the "armhf" code is intended for systems that use thumb, which raspbian
 +    doesn't.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 18:24:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Mar 2024 03:32:23 +0000
++
+ gcl (2.6.14-6) unstable; urgency=medium
+ 
+   * Version_2_6_15pre5
+ 
+  -- Camm Maguire <camm@debian.org>  Fri, 23 Feb 2024 11:05:05 -0500
+ 
+ gcl (2.6.14-5) unstable; urgency=medium
+ 
+   * Version_2_6_15pre4
+ 
+  -- Camm Maguire <camm@debian.org>  Fri, 23 Feb 2024 07:48:19 -0500
  
  gcl (2.6.14-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 3c4c1baac4cf11f167cdf00845971c7063d7d356,d18e7dfe3aceebffbb9318db6b822c67cedc5d0a..534e888f16dba07908d5fc0f1c840f4d37c9a1a1
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,5 +1,7 @@@
  Version_2_6_15pre1
  Version_2_6_15pre2
  Version_2_6_15pre3
+ Version_2_6_15pre4
+ Version_2_6_15pre5
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch