From: Raspbian automatic forward porter Date: Thu, 19 Dec 2024 11:48:32 +0000 (+0000) Subject: Merge version 5.115.0-2+rpi1 and 5.115.0-3 to produce 5.115.0-3+rpi1 X-Git-Tag: archive/raspbian/5.115.0-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e110c161e0590f7ac62217f50568ffc008cf1e60;p=ksyntax-highlighting.git Merge version 5.115.0-2+rpi1 and 5.115.0-3 to produce 5.115.0-3+rpi1 --- e110c161e0590f7ac62217f50568ffc008cf1e60 diff --cc debian/changelog index 5ad57dc,ce3f3e8..dcd920e --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,15 +1,25 @@@ - ksyntax-highlighting (5.115.0-2+rpi1) trixie-staging; urgency=medium ++ksyntax-highlighting (5.115.0-3+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 5.62.0-3+rpi1 by Peter Michael Green at Tue, 25 Feb 2020 04:12:28 +0000] + * Add symbols file hack for raspbian. + + [changes introduced in 5.103.0-2+rpi1 by Peter Michael Green] + * Link with libatomic on armhf too. + - -- Raspbian forward porter Thu, 20 Jun 2024 17:32:39 +0000 ++ -- Raspbian forward porter Thu, 19 Dec 2024 11:48:31 +0000 ++ + ksyntax-highlighting (5.115.0-3) unstable; urgency=medium + + * Team upload. + * CI: update/simplify configuration. + * Backport upstream commit aaede4eff4f9aa160be767c7b1aee0cf27cbb0e8, and + upstream commit 1105cfa14e6893ec909b74c1c0657742b8c2abd5 to fix the tests + with newer versions of PCRE; patch + upstream_use-sub-0-2-to-work-with-all-pcre-versions.patch, and + upstream_fix-refs.patch. (Closes: #1089200) + * Bump Standards-Version to 4.7.0, no changes required. + + -- Pino Toscano Mon, 16 Dec 2024 10:57:00 +0100 ksyntax-highlighting (5.115.0-2) unstable; urgency=medium