Merge version 14.2.21-1+rpi1 and 14.2.21-1.1 to produce 14.2.21-1.1+rpi1

diff --cc debian/changelog
index 172276856e0a83ee1b53a7f900f586f2ae6e2b64,c36ad85a4566421494be900e983376c3052727ed..e0e8608310003fb5251d36a34edb3f389d38f252
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- ceph (14.2.21-1+rpi1) bullseye-staging; urgency=medium
++ceph (14.2.21-1.1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 09:48:17 +0000]
 +  * Add Raspbian to lists of "debian-like" distros.
 +    + Hopefully this will fix site-packages vs dist-packages
 +      build failure in Raspbian.
 + 
 +  [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green]
 +  * Remove problematic gitattributes files.
 +  * Disable neon on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jun 2021 01:22:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 16:05:51 +0000
++
+ ceph (14.2.21-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Compile ppc.c on all powerpc machines. Fixes 32 bit powerpc build
+     (Closes: #993642).
+ 
+  -- Mattias Ellert <mattias.ellert@physics.uu.se>  Thu, 26 Aug 2021 10:36:49 +0200
  
  ceph (14.2.21-1) unstable; urgency=high
  

diff --cc debian/patches/series
index 79da3ce4bed9e1c9030ee0560e6c3e7e6a6bf9e4,23c4a828c500751366daba4ab07f64664f268cec..4b12c794b5e67afb5c4995b06365ec2fc0ca3a98
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,5 -20,4 +20,6 @@@ cmake_add_1.74_to_known_versions.patc
  another-cmakelists-fix.patch
  fix-ceph-osd-systemd-target.patch
  allow-bgp-to-host.patch
+ compile-ppc.c-on-all-powerpc-machines.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch