From: Raspbian automatic forward porter Date: Sun, 7 Aug 2022 05:20:41 +0000 (+0100) Subject: Merge version 2.6.12-118+rpi1 and 2.6.12-119 to produce 2.6.12-119+rpi1 X-Git-Tag: archive/raspbian/2.6.12-119+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f3225dcaf7e71caa20f66ce3e0141764eb1aa647;p=gcl.git Merge version 2.6.12-118+rpi1 and 2.6.12-119 to produce 2.6.12-119+rpi1 --- e6855c7fe93dc8aba60bb3cb26a2eba6379cb9b7 diff --cc debian/changelog index 7b885467,b39cdcb1..d384573a --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - gcl (2.6.12-118+rpi1) bookworm-staging; urgency=medium ++gcl (2.6.12-119+rpi1) bookworm-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 Sun, 24 Jul 2022 06:38:25 +0000 ++ -- Raspbian forward porter Sun, 07 Aug 2022 05:20:40 +0000 ++ + gcl (2.6.12-119) unstable; urgency=medium + + * Version_2.6.13pre119 + + -- Camm Maguire Sun, 31 Jul 2022 12:00:02 -0400 gcl (2.6.12-118) unstable; urgency=medium diff --cc debian/patches/series index 0bcb3bde,b4ed57ae..4dd92b00 --- a/debian/patches/series +++ b/debian/patches/series @@@ -132,5 -132,4 +132,6 @@@ Version_2.6.13pre11 Version_2.6.13pre112 Version_2.6.13pre113 Version_2.6.13pre114 + Version_2_6_13pre119 +make-error-more-explicit.patch +dont-use-armhf-relocs.patch