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

diff --cc debian/changelog
index 19259d672e0709b0b5132420d348e6477fe5ddf6,ae6dc89509b87c9cd9a574cf7984620af0ee4fc2..a934d9ad3f4f6939dd53b1b67369d13600ac40c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- gcl (2.6.12-95+rpi1) bullseye-staging; urgency=medium
++gcl (2.6.12-96+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>  Fri, 08 May 2020 05:43:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 11:31:15 +0000
++
+ gcl (2.6.12-96) unstable; urgency=high
+ 
+   * Version_2.6.13pre92: Work around armhf strip bug producing undefined
+     instruction in .plt
+ 
+  -- Camm Maguire <camm@debian.org>  Sun, 23 Aug 2020 17:53:14 +0000
  
  gcl (2.6.12-95) unstable; urgency=high
  

diff --cc debian/patches/series
index b307ca5d4017829e0db4f33990b0b42100e98447,f1a7ad293d5afd66b20b5c8348bc119e3ac47c41..5baf75cdb862edc64964c4396e1ac87a41e39198
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -112,5 -112,4 +112,6 @@@ Version_2_6_13pre8
  Version_2_6_13pre88
  Version_2_6_13pre89
  Version_2_6_13pre90
+ Version_2_6_13pre92
 +make-error-more-explicit.patch
 +dont-use-armhf-relocs.patch