Merge version 1.1.1-1+rpi1 and 1.1.2-1 to produce 1.1.2-1+rpi1 bookworm-staging archive/raspbian/1.1.2-1+rpi1 raspbian/1.1.2-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 19 Jan 2023 17:23:34 +0000 (17:23 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 19 Jan 2023 17:23:34 +0000 (17:23 +0000)
1  2 
debian/changelog
debian/patches/fix-armel-ftbfs.patch
src/Makevars.in

index e32c79d6e70f8acb445eac2582ec513fad5fe08c,964419f6bdf4210a021932bf121cd215ea2e505e..01c87ba3fbb36fac9832e7744100b81d24150491
@@@ -1,9 -1,9 +1,16 @@@
- r-cran-s2 (1.1.1-1+rpi1) bookworm-staging; urgency=medium
++r-cran-s2 (1.1.2-1+rpi1) bookworm-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>  Fri, 02 Dec 2022 06:44:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 17:23:34 +0000
++
+ r-cran-s2 (1.1.2-1) unstable; urgency=medium
+   * New upstream version
+   * Standards-Version: 4.6.2 (routine-update)
+  -- Andreas Tille <tille@debian.org>  Mon, 16 Jan 2023 13:49:37 +0100
  
  r-cran-s2 (1.1.1-1) unstable; urgency=medium
  
Simple merge
diff --cc src/Makevars.in
Simple merge