Merge version 1.1.2-1+rpi1 and 1.1.4-1 to produce 1.1.4-1+rpi1

diff --cc debian/changelog
index 01c87ba3fbb36fac9832e7744100b81d24150491,3ffc2a370926089612a383c4a1762e53878ca89f..2289fa637de3de2170c813731fb571b420d65b36
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- r-cran-s2 (1.1.2-1+rpi1) bookworm-staging; urgency=medium
++r-cran-s2 (1.1.4-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.7-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Oct 2021 13:41:14 +0000]
 +  * Link with libatomic on armhf too for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 17:23:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Sep 2023 19:35:54 +0000
++
+ r-cran-s2 (1.1.4-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Test-Depends as per Suggests
+ 
+  -- Andreas Tille <tille@debian.org>  Fri, 30 Jun 2023 21:49:50 +0200
  
  r-cran-s2 (1.1.2-1) unstable; urgency=medium
  

diff --cc debian/patches/fix-armel-ftbfs.patch
index 704ada8657fa9de746aa6ea28a9b0c61856a968c,fcf99923114776aea172fee49dff2caf4d35dbd8..220867f3629574003ae0fa9c05761f8464e90d29
--- 1/debian/patches/fix-armel-ftbfs.patch
--- 2/debian/patches/fix-armel-ftbfs.patch
+++ b/debian/patches/fix-armel-ftbfs.patch
@@@ -3,11 -3,11 +3,11 @@@ Author: Nilesh Patra <nilesh@debian.org
  Last-Update: 2021-10-05
  --- a/src/Makevars.in
  +++ b/src/Makevars.in
- @@ -3,6 +3,10 @@ PKG_LIBS = @libs@
-  PKG_CXXFLAGS = @cflags@ -pthread
+ @@ -4,6 +4,10 @@ PKG_CXXFLAGS = @cflags@ -pthread
+  
   CXX_STD = CXX11
   
 -+ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel riscv64 m68k powerpc))
 ++ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf mipsel riscv64 m68k powerpc))
  +PKG_LIBS += -latomic
  +endif
  +

diff --cc src/Makevars.in
index 7b97259fce4fc4e2c721a3857008feb6e49f1b2a,b3fcd35a58971589d4a46ba198ee375c625f2d55..e7b0ec9f5320232a2f5e39b3b33a24b99846d85b
--- 1/src/Makevars.in
--- 2/src/Makevars.in
+++ b/src/Makevars.in
@@@ -1,9 -1,10 +1,10 @@@
  PKG_CPPFLAGS = -I../src -DSTRICT_R_HEADERS
  PKG_LIBS = @libs@
  PKG_CXXFLAGS = @cflags@ -pthread
+ 
  CXX_STD = CXX11
  
 -ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel riscv64 m68k powerpc))
 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf mipsel riscv64 m68k powerpc))
  PKG_LIBS += -latomic
  endif