Manual merge of version 1.2.5-4+rpi1 and 1.2.5-5 to produce 1.2.5-5+rpi1

diff --cc debian/changelog
index 5533a59769981a990f592017e35449fac4c310c5,fc1e8edc9329992d00868c579e32771f735d8db1..7afa1deab1d4d204169c79be697775901092761d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,16 @@@
- gogglesmm (1.2.5-4+rpi1) trixie-staging; urgency=medium
++gogglesmm (1.2.5-5+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.2.5-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 23 Jan 2025 22:57:45 +0000]
 +  * Apply armel fix on armhf too for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 23 Jan 2025 22:57:45 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 05 Sep 2025 02:55:28 +0000
++
+ gogglesmm (1.2.5-5) unstable; urgency=medium
+ 
+   * update Build-Dependency libtag1-dev --> libtag-dev (closes: #1096086)
+   * Bump policy (no change)
+ 
+  -- Cord Beermann <cord@debian.org>  Sat, 22 Mar 2025 16:07:35 +0100
  
  gogglesmm (1.2.5-4) unstable; urgency=medium
  

diff --cc debian/rules
index 2e053e2619c65db15d9e508c17950ba973848be4,91921ca2cbba33949643cce3e9d3394d13ad4855..f57c1b098836a97514c4e9c0ffcec1a79b5beefd
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -18,13 -18,34 +18,39 @@@ ifeq ($(DEB_TARGET_ARCH), armel
    LDFLAGS+=-Wl,--copy-dt-needed-entries
  endif
  
 +# ftbfs-fix for armel
 +ifeq ($(DEB_TARGET_ARCH), armhf)
 +  LDFLAGS+=-Wl,--copy-dt-needed-entries
 +endif
 +
+ # ftbfs-fix for armel
+ ifeq ($(DEB_TARGET_ARCH), armel)
+   LDFLAGS+=-Wl,--copy-dt-needed-entries
+ endif
+ 
+ # ftbfs-fix for m68k
+ ifeq ($(DEB_TARGET_ARCH), m68k)
+   LDFLAGS+=-Wl,--copy-dt-needed-entries
+   LDLIBS+=-latomic
+ endif
+ 
+ # ftbfs-fix for powerpc
+ ifeq ($(DEB_TARGET_ARCH), powerpc)
+   LDFLAGS+=-Wl,--copy-dt-needed-entries
+   LDLIBS+=-latomic
+ endif
+ 
+ # ftbfs-fix for sh4
+ ifeq ($(DEB_TARGET_ARCH), sh4)
+   LDFLAGS+=-Wl,--copy-dt-needed-entries
+   LDLIBS+=-latomic
+ endif
+ 
  CC_FOR_BUILD ?= cc
  
+ override_dh_auto_configure:
+       dh_auto_configure $@ --buildsystem=cmake -- -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)"
+ 
  # uncommect for more insights.
  #override_dh_auto_configure:
  #     env