Merge version 2.6.12-115+rpi1 and 2.6.12-117 to produce 2.6.12-117+rpi1

diff --cc debian/changelog
index 3a3c35dd0560d75f5cc0259e8b7b79a0862b5811,83fd87749bf859aad80e3e10cf95f3a104bdbe0c..be830e69b5d3c301daa8acb6e6ee0ec5be9f1bab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,24 @@@
- gcl (2.6.12-115+rpi1) bookworm-staging; urgency=medium
++gcl (2.6.12-117+rpi1) bookworm-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>  Fri, 24 Dec 2021 17:03:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 03:25:17 +0000
++
+ gcl (2.6.12-117) unstable; urgency=medium
+ 
+   * Version_2.6.13pre114
+ 
+  -- Camm Maguire <camm@debian.org>  Sat, 25 Dec 2021 11:38:16 -0500
+ 
+ gcl (2.6.12-116) unstable; urgency=medium
+ 
+   * Version_2.6.13pre113
+ 
+  -- Camm Maguire <camm@debian.org>  Wed, 22 Dec 2021 19:52:18 +0000
  
  gcl (2.6.12-115) unstable; urgency=medium
  

diff --cc debian/patches/series
index 822d536efc7cf9df228c531eb3d7e94bc1784249,1366d6edcbc32ea033fd63990faf831ecc1232fb..0bcb3bde5d7489ec8f9dc1bb9013ab09e63cb376
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -130,5 -130,5 +130,7 @@@ Version_2.6.13pre10
  Version_2.6.13pre110
  Version_2.6.13pre111
  Version_2.6.13pre112
+ Version_2.6.13pre113
+ Version_2.6.13pre114
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch