From: Raspbian automatic forward porter Date: Tue, 1 Sep 2020 11:31:15 +0000 (+0100) Subject: Merge version 2.6.12-95+rpi1 and 2.6.12-96 to produce 2.6.12-96+rpi1 X-Git-Tag: archive/raspbian/2.6.12-96+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a21e0c3a6b728be390b540643aeb7f3da5dddf5b;p=gcl.git Merge version 2.6.12-95+rpi1 and 2.6.12-96 to produce 2.6.12-96+rpi1 --- a21e0c3a6b728be390b540643aeb7f3da5dddf5b diff --cc debian/changelog index 19259d67,ae6dc895..a934d9ad --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,19 @@@ - gcl (2.6.12-95+rpi1) bullseye-staging; urgency=medium ++gcl (2.6.12-96+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, 08 May 2020 05:43:57 +0000 ++ -- Raspbian forward porter Tue, 01 Sep 2020 11:31:15 +0000 ++ + gcl (2.6.12-96) unstable; urgency=high + + * Version_2.6.13pre92: Work around armhf strip bug producing undefined + instruction in .plt + + -- Camm Maguire Sun, 23 Aug 2020 17:53:14 +0000 gcl (2.6.12-95) unstable; urgency=high diff --cc debian/patches/series index b307ca5d,f1a7ad29..5baf75cd --- a/debian/patches/series +++ b/debian/patches/series @@@ -112,5 -112,4 +112,6 @@@ Version_2_6_13pre8 Version_2_6_13pre88 Version_2_6_13pre89 Version_2_6_13pre90 + Version_2_6_13pre92 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch