From: Raspbian automatic forward porter Date: Thu, 10 Dec 2020 14:16:13 +0000 (+0000) Subject: Merge version 2.6.12-98+rpi1 and 2.6.12-99 to produce 2.6.12-99+rpi1 X-Git-Tag: raspbian/2.6.12-99+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e0e7b25ad9b4d005d3d01eabe3cefc3b7007727f;p=gcl.git Merge version 2.6.12-98+rpi1 and 2.6.12-99 to produce 2.6.12-99+rpi1 --- 85e14910fab1eb3fd3155f0ed1d02b0a02e04f13 diff --cc debian/changelog index db7e1f18,6513f269..e94bc1ae --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.12-98+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-99+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 Wed, 07 Oct 2020 12:06:57 +0000 ++ -- Raspbian forward porter Thu, 10 Dec 2020 14:16:12 +0000 ++ + gcl (2.6.12-99) unstable; urgency=medium + + * Version_2.6.13pre95 + + -- Camm Maguire Sat, 28 Nov 2020 15:50:42 +0000 gcl (2.6.12-98) unstable; urgency=medium diff --cc debian/patches/series index 88dacd19,293b7ebd..d424fcae --- a/debian/patches/series +++ b/debian/patches/series @@@ -114,5 -114,4 +114,6 @@@ Version_2_6_13pre8 Version_2_6_13pre90 Version_2_6_13pre92 Version_2_6_13pre94 + Version_2_6_13pre95 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch