From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 19 Oct 2024 00:13:36 +0000 (+0100)
Subject: Merge version 1.1.6-1+rpi1 and 1.1.7-1 to produce 1.1.7-1+rpi1
X-Git-Tag: archive/raspbian/1.1.7-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=024cefb0ad08807d218ba3790be856e60ea2bad9;p=r-cran-s2.git

Merge version 1.1.6-1+rpi1 and 1.1.7-1 to produce 1.1.7-1+rpi1
---

024cefb0ad08807d218ba3790be856e60ea2bad9
diff --cc debian/changelog
index 9b4d779,c180e80..aa3d91f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- r-cran-s2 (1.1.6-1+rpi1) trixie-staging; urgency=medium
++r-cran-s2 (1.1.7-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>  Wed, 02 Oct 2024 08:39:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 19 Oct 2024 00:13:36 +0000
++
+ r-cran-s2 (1.1.7-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version
+   * Standards-Version: 4.7.0 (routine-update)
+   * Unfuzz debian/patches/fix-armel-ftbfs.patch
+ 
+  -- Charles Plessy <plessy@debian.org>  Fri, 04 Oct 2024 08:37:27 +0900
  
  r-cran-s2 (1.1.6-1) unstable; urgency=medium
  
diff --cc debian/patches/fix-armel-ftbfs.patch
index 220867f,c153300..fe79ed0
--- a/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
- @@ -4,6 +4,10 @@ PKG_CXXFLAGS = @cflags@ -pthread
+ @@ -4,6 +4,10 @@
   
-  CXX_STD = CXX11
+  CXX_STD = CXX14
   
 -+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 e7b0ec9,1ce1490..35bf8b4
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@@ -2,9 -2,9 +2,9 @@@ PKG_CPPFLAGS = -I../src -DSTRICT_R_HEAD
  PKG_LIBS = @libs@
  PKG_CXXFLAGS = @cflags@ -pthread
  
- CXX_STD = CXX11
+ CXX_STD = CXX14
  
 -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