From: Raspbian automatic forward porter Date: Mon, 8 Feb 2021 08:30:34 +0000 (+0000) Subject: Merge version 2.6.12-101+rpi1 and 2.6.12-102 to produce 2.6.12-102+rpi1 X-Git-Tag: archive/raspbian/2.6.12-102+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90cc7439660ce695196c4b58d1cdd37bc381565b;p=gcl.git Merge version 2.6.12-101+rpi1 and 2.6.12-102 to produce 2.6.12-102+rpi1 --- 90cc7439660ce695196c4b58d1cdd37bc381565b diff --cc debian/changelog index dea26e75,c916e9d1..d8babaa7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,10 +1,20 @@@ - gcl (2.6.12-101+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-102+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 Sat, 23 Jan 2021 12:25:30 +0000 ++ -- Raspbian forward porter Mon, 08 Feb 2021 08:30:34 +0000 ++ + gcl (2.6.12-102) unstable; urgency=medium + + * Version_2.6.13pre99 + * Bug fix: "describe fails because gcl-si.info does not exist", thanks + to Leo Butler (Closes: #980003). + + -- Camm Maguire Fri, 29 Jan 2021 19:08:05 +0000 gcl (2.6.12-101) unstable; urgency=medium diff --cc debian/patches/series index 338038de,7ac707cb..daa2696b --- a/debian/patches/series +++ b/debian/patches/series @@@ -117,5 -117,4 +117,6 @@@ Version_2_6_13pre9 Version_2_6_13pre95 Version_2.6.13pre96 Version_2_6_13pre98 + Version_2_6_13pre99 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch