Merge version 0~20210324.2-3+rpi1 and 0~20210324.2-4 to produce 0~20210324.2-4+rpi1

diff --cc debian/changelog
index 87ac4bbcd11cbb1edbbc24866763a9c488f09c45,22d44a713e6090c777dbfccfac1584dbb617fe35..aaa4aa5f66b98e7efa9f0139218821d5c0c3e755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- abseil (0~20210324.2-3+rpi1) bookworm-staging; urgency=medium
++abseil (0~20210324.2-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0~20210324.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Feb 2022 01:39:43 +0000]
 +  * Disable TestArmThumbOverlap, it fails to build with a "sorry unimplemented"
 +    error.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 11 May 2022 02:15:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 15 Jun 2022 14:44:52 +0000
++
+ abseil (0~20210324.2-4) unstable; urgency=medium
+ 
+   * Fix "spurious -Wl flag in some pkg-config entries" by backporting a
+     patch from upstream that corrects CMake pkg-config generation.
+     (Closes: #1011294)
+ 
+  -- Benjamin Barenblat <bbaren@debian.org>  Fri, 27 May 2022 16:58:38 -0400
  
  abseil (0~20210324.2-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index f957b2d35a16e38c606df416bebd5758f564aae2,f335570ee54d1f655defe64b2dd9e02f60940e3b..1d5e40c49dd0de6e7514693dbd061c3c27aabd6b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -16,4 -16,4 +16,5 @@@ big-endian-random4.dif
  disable-nominalcpufrequency-test.diff
  hppa-symbolize.diff
  str-format-convert-test-printf.diff
+ pkg-config-libs-generation.diff
 +disable-testarmthumboverlap.patch