From: Raspbian automatic forward porter Date: Wed, 7 Oct 2020 12:06:57 +0000 (+0100) Subject: Merge version 2.6.12-97+rpi1 and 2.6.12-98 to produce 2.6.12-98+rpi1 X-Git-Tag: archive/raspbian/2.6.12-98+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6bd9a9f71bee652cf5b5e488729deb9dd7d4d73c;p=gcl.git Merge version 2.6.12-97+rpi1 and 2.6.12-98 to produce 2.6.12-98+rpi1 --- 466a51ba84d939f471c51216c4045ca94e7943c7 diff --cc debian/changelog index fc2bd10c,b806fae1..db7e1f18 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.12-97+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-98+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 Sun, 06 Sep 2020 10:35:56 +0000 ++ -- Raspbian forward porter Wed, 07 Oct 2020 12:06:57 +0000 ++ + gcl (2.6.12-98) unstable; urgency=medium + + * Version_2.6.13pre94 + + -- Camm Maguire Tue, 29 Sep 2020 18:29:10 +0000 gcl (2.6.12-97) unstable; urgency=medium diff --cc debian/patches/series index 5baf75cd,b69f2942..88dacd19 --- a/debian/patches/series +++ b/debian/patches/series @@@ -113,5 -113,4 +113,6 @@@ Version_2_6_13pre8 Version_2_6_13pre89 Version_2_6_13pre90 Version_2_6_13pre92 + Version_2_6_13pre94 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch