From: Peter Michael Green Date: Tue, 6 Jun 2023 15:08:34 +0000 (+0000) Subject: Manual merge of version 5.103.0-2+rpi1 and 5.103.0-3 to produce 5.103.0-3+rpi1 X-Git-Tag: archive/raspbian/5.103.0-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f2ddbe70bffde717d85e2cded1a4259d0f9a9fab;p=ksyntax-highlighting.git Manual merge of version 5.103.0-2+rpi1 and 5.103.0-3 to produce 5.103.0-3+rpi1 --- f2ddbe70bffde717d85e2cded1a4259d0f9a9fab diff --cc debian/changelog index 34b656f,13f8321..a1374e5 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,19 @@@ - ksyntax-highlighting (5.103.0-2+rpi1) bookworm-staging; urgency=medium ++ksyntax-highlighting (5.103.0-3+rpi1) bookworm-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. + - -- Peter Michael Green Sun, 26 Feb 2023 11:00:11 +0000 ++ -- Peter Michael Green Tue, 06 Jun 2023 15:07:09 +0000 ++ + ksyntax-highlighting (5.103.0-3) unstable; urgency=medium + + * Team upload. + * Link with atomic also on powerpc. + + -- Pino Toscano Sun, 26 Feb 2023 16:34:47 +0100 ksyntax-highlighting (5.103.0-2) unstable; urgency=medium diff --cc debian/rules index 67d7ea4,9c6bf85..b49facc --- a/debian/rules +++ b/debian/rules @@@ -3,7 -3,7 +3,7 @@@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all - archs_that_need_atomic = armel armhf m68k mipsel sh4 -archs_that_need_atomic = armel m68k mipsel powerpc sh4 ++archs_that_need_atomic = armel armhf m68k mipsel powerpc sh4 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic))) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed endif