From: Raspbian automatic forward porter Date: Fri, 8 Mar 2024 03:32:23 +0000 (+0000) Subject: Merge version 2.6.14-4+rpi1 and 2.6.14-6 to produce 2.6.14-6+rpi1 X-Git-Tag: archive/raspbian/2.6.14-6+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e24294d112510485eb3b35afb6d31b5486821df4;p=gcl.git Merge version 2.6.14-4+rpi1 and 2.6.14-6 to produce 2.6.14-6+rpi1 --- e24294d112510485eb3b35afb6d31b5486821df4 diff --cc debian/changelog index 2e73a402,02b67428..27ed5a77 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,14 +1,24 @@@ - gcl (2.6.14-4+rpi1) bookworm-staging; urgency=medium ++gcl (2.6.14-6+rpi1) trixie-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, 25 Feb 2023 18:24:36 +0000 ++ -- Raspbian forward porter Fri, 08 Mar 2024 03:32:23 +0000 ++ + gcl (2.6.14-6) unstable; urgency=medium + + * Version_2_6_15pre5 + + -- Camm Maguire Fri, 23 Feb 2024 11:05:05 -0500 + + gcl (2.6.14-5) unstable; urgency=medium + + * Version_2_6_15pre4 + + -- Camm Maguire Fri, 23 Feb 2024 07:48:19 -0500 gcl (2.6.14-4) unstable; urgency=medium diff --cc debian/patches/series index 3c4c1baa,d18e7dfe..534e888f --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,5 -1,5 +1,7 @@@ Version_2_6_15pre1 Version_2_6_15pre2 Version_2_6_15pre3 + Version_2_6_15pre4 + Version_2_6_15pre5 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch