From: Raspbian automatic forward porter Date: Tue, 11 Jan 2022 03:25:17 +0000 (+0000) Subject: Merge version 2.6.12-115+rpi1 and 2.6.12-117 to produce 2.6.12-117+rpi1 X-Git-Tag: raspbian/2.6.12-117+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef3bb609022b5557f97ef53ce178da3a9265cc11;p=gcl.git Merge version 2.6.12-115+rpi1 and 2.6.12-117 to produce 2.6.12-117+rpi1 --- e84728231272940f51e7779afb6396108fe580d8 diff --cc debian/changelog index 3a3c35dd,83fd8774..be830e69 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,14 +1,24 @@@ - gcl (2.6.12-115+rpi1) bookworm-staging; urgency=medium ++gcl (2.6.12-117+rpi1) bookworm-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, 24 Dec 2021 17:03:41 +0000 ++ -- Raspbian forward porter Tue, 11 Jan 2022 03:25:17 +0000 ++ + gcl (2.6.12-117) unstable; urgency=medium + + * Version_2.6.13pre114 + + -- Camm Maguire Sat, 25 Dec 2021 11:38:16 -0500 + + gcl (2.6.12-116) unstable; urgency=medium + + * Version_2.6.13pre113 + + -- Camm Maguire Wed, 22 Dec 2021 19:52:18 +0000 gcl (2.6.12-115) unstable; urgency=medium diff --cc debian/patches/series index 822d536e,1366d6ed..0bcb3bde --- a/debian/patches/series +++ b/debian/patches/series @@@ -130,5 -130,5 +130,7 @@@ Version_2.6.13pre10 Version_2.6.13pre110 Version_2.6.13pre111 Version_2.6.13pre112 + Version_2.6.13pre113 + Version_2.6.13pre114 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch