Merge version 2.6.12-97+rpi1 and 2.6.12-98 to produce 2.6.12-98+rpi1

diff --cc debian/changelog
index fc2bd10ca2c2b6f909ce00a79efd772e176e6f36,b806fae116e979be45d68c88400586a5c3e4d090..db7e1f1890898c5c88ff94f0b4a897ee40478192
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- gcl (2.6.12-97+rpi1) bullseye-staging; urgency=medium
++gcl (2.6.12-98+rpi1) bullseye-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>  Sun, 06 Sep 2020 10:35:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Oct 2020 12:06:57 +0000
++
+ gcl (2.6.12-98) unstable; urgency=medium
+ 
+   * Version_2.6.13pre94
+ 
+  -- Camm Maguire <camm@debian.org>  Tue, 29 Sep 2020 18:29:10 +0000
  
  gcl (2.6.12-97) unstable; urgency=medium
  

diff --cc debian/patches/series
index 5baf75cdb862edc64964c4396e1ac87a41e39198,b69f29424b7e3adeeff0c91a1c7d9f999d6295ad..88dacd196f3916973db90b7b706614c80c032a27
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -113,5 -113,4 +113,6 @@@ Version_2_6_13pre8
  Version_2_6_13pre89
  Version_2_6_13pre90
  Version_2_6_13pre92
+ Version_2_6_13pre94
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch