From: Raspbian automatic forward porter Date: Wed, 2 Apr 2025 15:42:02 +0000 (+0100) Subject: Merge version 2.6.14-18+rpi1 and 2.6.14-19 to produce 2.6.14-19+rpi1 X-Git-Tag: archive/raspbian/2.6.14-19+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ba5f55695f356c0add8cb03414f19a6ffe6dd5f;p=gcl.git Merge version 2.6.14-18+rpi1 and 2.6.14-19 to produce 2.6.14-19+rpi1 --- 5ba5f55695f356c0add8cb03414f19a6ffe6dd5f diff --cc debian/changelog index 585d5df3,f75c3171..07080fd1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.14-18+rpi1) trixie-staging; urgency=medium ++gcl (2.6.14-19+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 Fri, 14 Mar 2025 14:51:20 +0000 ++ -- Raspbian forward porter Wed, 02 Apr 2025 15:42:01 +0000 ++ + gcl (2.6.14-19) unstable; urgency=medium + + * Version_2_6_15pre18 + + -- Camm Maguire Tue, 25 Mar 2025 12:52:33 -0400 gcl (2.6.14-18) unstable; urgency=medium diff --cc debian/patches/series index 03d2ad1e,6839ffab..5a666b54 --- a/debian/patches/series +++ b/debian/patches/series @@@ -13,5 -13,4 +13,6 @@@ Version_2_6_15pre1 Version_2_6_15pre15 Version_2_6_15pre16 Version_2_6_15pre17 + Version_2_6_15pre18 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch