Manual merge of version 5.103.0-2+rpi1 and 5.103.0-3 to produce 5.103.0-3+rpi1

diff --cc debian/changelog
index 34b656f90d5c7ac3d64a6c5cfa499ee6cffab1e4,13f8321fb01ff7653f30c53e7557a4caf05df1cd..a1374e5d205395aa03250e53a0d8a0dc11262004
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org>  Sun, 26 Feb 2023 11:00:11 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  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 <pino@debian.org>  Sun, 26 Feb 2023 16:34:47 +0100
  
  ksyntax-highlighting (5.103.0-2) unstable; urgency=medium
  

diff --cc debian/rules
index 67d7ea4385995323e9596946ad8ca177be21fc1d,9c6bf8549dd66ec6eef8cd55bd9fb1c69c5ff3c6..b49facc7b973a3654b473b8cce0ef4151ba4a15d
--- 1/debian/rules
--- 2/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