From: Raspbian automatic forward porter Date: Sat, 23 Jan 2021 12:25:31 +0000 (+0000) Subject: Merge version 2.6.12-100+rpi1 and 2.6.12-101 to produce 2.6.12-101+rpi1 X-Git-Tag: archive/raspbian/2.6.12-101+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=acab790077ce9a7f647512d3ed40de51fdf3644f;p=gcl.git Merge version 2.6.12-100+rpi1 and 2.6.12-101 to produce 2.6.12-101+rpi1 --- acab790077ce9a7f647512d3ed40de51fdf3644f diff --cc debian/changelog index e61cc9d1,0de6f64c..dea26e75 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.12-100+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-101+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 Fri, 11 Dec 2020 18:52:30 +0000 ++ -- Raspbian forward porter Sat, 23 Jan 2021 12:25:30 +0000 ++ + gcl (2.6.12-101) unstable; urgency=medium + + * Version_2.6.13pre98 + + -- Camm Maguire Sun, 17 Jan 2021 16:25:34 +0000 gcl (2.6.12-100) unstable; urgency=medium diff --cc debian/patches/series index 2e7ec4d3,09fe9aa1..338038de --- a/debian/patches/series +++ b/debian/patches/series @@@ -116,5 -116,4 +116,6 @@@ Version_2_6_13pre9 Version_2_6_13pre94 Version_2_6_13pre95 Version_2.6.13pre96 + Version_2_6_13pre98 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch