From: Raspbian automatic forward porter Date: Mon, 10 Feb 2025 03:24:38 +0000 (+0000) Subject: Merge version 2.6.14-11+rpi1 and 2.6.14-12 to produce 2.6.14-12+rpi1 X-Git-Tag: archive/raspbian/2.6.14-12+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0710a7e62d87a9f4a0361dc9e10c1f8b878d7614;p=gcl.git Merge version 2.6.14-11+rpi1 and 2.6.14-12 to produce 2.6.14-12+rpi1 --- 0710a7e62d87a9f4a0361dc9e10c1f8b878d7614 diff --cc debian/changelog index 5aacfaa9,43ea7126..66eed3ff --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.14-11+rpi1) trixie-staging; urgency=medium ++gcl (2.6.14-12+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 Thu, 25 Jul 2024 01:19:56 +0000 ++ -- Raspbian forward porter Mon, 10 Feb 2025 03:24:38 +0000 ++ + gcl (2.6.14-12) unstable; urgency=medium + + * Version_2_6_15pre11 + + -- Camm Maguire Mon, 03 Feb 2025 15:01:46 -0500 gcl (2.6.14-11) unstable; urgency=medium diff --cc debian/patches/series index 0b1593f4,8c179da8..8c4b6c68 --- a/debian/patches/series +++ b/debian/patches/series @@@ -8,5 -8,4 +8,6 @@@ Version_2_6_15pre Version_2_6_15pre8 Version_2_6_15pre9 Version_2_6_15pre10 + Version_2_6_15pre11 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch