Merge version 2.6.12-99+rpi1 and 2.6.12-100 to produce 2.6.12-100+rpi1

diff --cc debian/changelog
index e94bc1aecca131e5546525ba1194f601c3067026,dedb809bd75de6c7faaa3679fa9cc37750363f52..e61cc9d144b27cb857139e92dbb01581f18af53b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- gcl (2.6.12-99+rpi1) bullseye-staging; urgency=medium
++gcl (2.6.12-100+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>  Thu, 10 Dec 2020 14:16:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Dec 2020 18:52:30 +0000
++
+ gcl (2.6.12-100) unstable; urgency=medium
+ 
+   * Version_2.6.13pre97
+ 
+  -- Camm Maguire <camm@debian.org>  Fri, 04 Dec 2020 14:51:41 +0000
  
  gcl (2.6.12-99) unstable; urgency=medium
  

diff --cc debian/patches/series
index d424fcaec1220df6276fe03669a0e3860145f684,5b9e21c7f3fbba50deb4760249d6cbf730027461..2e7ec4d33fcbbad6fcf35a6f583d0fb7891f63dd
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -115,5 -115,4 +115,6 @@@ Version_2_6_13pre9
  Version_2_6_13pre92
  Version_2_6_13pre94
  Version_2_6_13pre95
+ Version_2.6.13pre96
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch