From: Raspbian automatic forward porter Date: Fri, 11 Dec 2020 18:52:30 +0000 (+0000) Subject: Merge version 2.6.12-99+rpi1 and 2.6.12-100 to produce 2.6.12-100+rpi1 X-Git-Tag: archive/raspbian/2.6.12-100+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33caba845d7b3c95ea4d94a638c02ee1ddf328d4;p=gcl.git Merge version 2.6.12-99+rpi1 and 2.6.12-100 to produce 2.6.12-100+rpi1 --- 33caba845d7b3c95ea4d94a638c02ee1ddf328d4 diff --cc debian/changelog index e94bc1ae,dedb809b..e61cc9d1 --- a/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 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 Thu, 10 Dec 2020 14:16:12 +0000 ++ -- Raspbian forward porter Fri, 11 Dec 2020 18:52:30 +0000 ++ + gcl (2.6.12-100) unstable; urgency=medium + + * Version_2.6.13pre97 + + -- Camm Maguire Fri, 04 Dec 2020 14:51:41 +0000 gcl (2.6.12-99) unstable; urgency=medium diff --cc debian/patches/series index d424fcae,5b9e21c7..2e7ec4d3 --- a/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