Manual merge of version 8.7.0+git220824-1+rpi1 and 8.9.0-1 to produce 8.9.0-1+rpi1

diff --cc GNUmakefile
index 97b05ea1e26bea749617288405fc35b7e770fbb9,0c907e408b34e6fcc6cfc5f927381a6b8156c8cc..8f09914319714cbd4d03e2c075542494f5509c1c
--- 1/GNUmakefile
--- 2/GNUmakefile
+++ b/GNUmakefile
@@@ -1197,10 -1194,14 +1194,10 @@@ endi
  
  # Cryptogams source files. We couple to ARMv7 and NEON due to SHA using NEON.
  # Limit to Linux. The source files target the GNU assembler.
- # Also see https://www.crypto++.com/wiki/Cryptogams.
+ # Also see https://www.cryptopp.com/wiki/Cryptogams.
  ifeq ($(IS_ARM32)$(IS_LINUX),11)
    ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXFLAGS)),)
 -    # Do not use -march=armv7 if the compiler is already targeting the ISA.
 -    # Also see https://github.com/weidai11/cryptopp/issues/1094
 -    ifeq ($(shell $(CXX) -dM -E TestPrograms/test_cxx.cpp 2>/dev/null | grep -E '__ARM_ARCH 7|__ARM_ARCH_7A__'),)
 -      CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a
 -    endif
 +    CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a+fp
      ifeq ($(CLANG_COMPILER),1)
        CRYPTOGAMS_ARM_FLAG = $(CRYPTOGAMS_ARMV7_FLAG)
        CRYPTOGAMS_ARM_THUMB_FLAG = $(CRYPTOGAMS_ARMV7_FLAG) -mthumb

diff --cc debian/changelog
index 203e8cddcf5f7794917c2d7d7a5d90dc0fc1c0eb,39e5f8e9fd813466330fe4f644e68d9d23c003af..26839de99d84ae4d91346c6954d31f2c576852c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,25 +1,37 @@@
- libcrypto++ (8.7.0+git220824-1+rpi1) bookworm-staging; urgency=medium
++libcrypto++ (8.9.0-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 8.6.0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Mar 2022 22:09:41 +0000]
 +  * Upload to raspbian despite detection of armv7 contaimination,
 +    investigation of the code shows that the armv7/neon code seems
 +    to be safely behind runtime CPU testection.
 +  * Pass -march=armv7+fp instead of -march=armv7 when building "armv4"
 +    assembler files. Despite the names these files only seem to be used
 +    on armv7.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Nov 2022 00:07:27 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Sat, 06 Jan 2024 13:37:02 +0000
++
+ libcrypto++ (8.9.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 02 Oct 2023 17:51:51 +0200
+ 
+ libcrypto++ (8.8.0-2) unstable; urgency=medium
+ 
+   * Update watch file.
+   * Update Standards-Version to 4.6.2 .
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 07 Sep 2023 07:25:20 +0000
+ 
+ libcrypto++ (8.8.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+   [ Helmut Grohne <helmut@subdivi.de> ]
+   * Fix FTCBFS: Export build tools for all targets (closes: #1018923).
+ 
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 07 Jul 2023 17:20:07 +0200
  
  libcrypto++ (8.7.0+git220824-1) unstable; urgency=medium