From: Raspbian automatic forward porter Date: Tue, 7 Jan 2020 08:36:55 +0000 (+0000) Subject: Merge version 2.6.12-91+rpi1 and 2.6.12-92 to produce 2.6.12-92+rpi1 X-Git-Tag: archive/raspbian/2.6.12-92+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d0f5ec4a6515cf52c1150a55e501f149023b4469;p=gcl.git Merge version 2.6.12-91+rpi1 and 2.6.12-92 to produce 2.6.12-92+rpi1 --- d0f5ec4a6515cf52c1150a55e501f149023b4469 diff --cc debian/changelog index afc914fe,29f18157..bb7363da --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.12-91+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-92+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, 27 Dec 2019 12:32:53 +0000 ++ -- Raspbian forward porter Tue, 07 Jan 2020 08:36:55 +0000 ++ + gcl (2.6.12-92) unstable; urgency=medium + + * Version_2_6_13pre89 + + -- Camm Maguire Mon, 30 Dec 2019 15:46:22 +0000 gcl (2.6.12-91) unstable; urgency=medium diff --cc debian/patches/series index 8fb98538,ab163cd3..367885ea --- a/debian/patches/series +++ b/debian/patches/series @@@ -110,5 -110,4 +110,6 @@@ Version_2_6_13pre8 Version_2_6_13pre86 Version_2_6_13pre87 Version_2_6_13pre88 + Version_2_6_13pre89 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch