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

diff --cc debian/changelog
index a934d9ad3f4f6939dd53b1b67369d13600ac40c1,863de7cf6949d13f1339c630ca2b06a2ba2f3b54..fc2bd10ca2c2b6f909ce00a79efd772e176e6f36
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- gcl (2.6.12-96+rpi1) bullseye-staging; urgency=medium
++gcl (2.6.12-97+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>  Tue, 01 Sep 2020 11:31:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 06 Sep 2020 10:35:56 +0000
++
+ gcl (2.6.12-97) unstable; urgency=medium
+ 
+   * Bug fix: "Removal of obsolete debhelper compat 5 and 6 in bookworm",
+     thanks to Niels Thykier (Closes: #965543).
+   * Version_2.6.13pre93
+ 
+  -- Camm Maguire <camm@debian.org>  Sat, 29 Aug 2020 16:23:07 +0000
  
  gcl (2.6.12-96) unstable; urgency=high