Merge version 12.2.10+dfsg1-1+rpi1 and 12.2.11+dfsg1-2 to produce 12.2.11+dfsg1-2...

diff --cc debian/changelog
index 90a82422e64ab850506d07220332c4e899e7ecde,92d40bfbe44d7957376acf0ea4d0485c295401d9..d813d816a1809af63a13e66bbfdcf2cb811e1d6b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,27 +1,36 @@@
- ceph (12.2.10+dfsg1-1+rpi1) buster-staging; urgency=medium
++ceph (12.2.11+dfsg1-2+rpi1) buster-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Mar 2019 19:46:21 +0000
++
+ ceph (12.2.11+dfsg1-2) unstable; urgency=medium
+ 
+   * [27a321] Fix builds on 32bit architectures
+   * [346bfa] Fix linking radosgw without BEAST frontend
+ 
+  -- Gaudenz Steinlin <gaudenz@debian.org>  Tue, 19 Feb 2019 08:50:12 +0100
+ 
+ ceph (12.2.11+dfsg1-1) unstable; urgency=medium
+ 
+   * [8b6f70] Build depend on cmake >= 3.13.2
+   * [98ed84] New upstream version 12.2.11+dfsg1
+     - Fixes CVE-2018-14662, CVE-2018-16889, CVE-2018-16846
+     (Closes: #921948, #918969, #921947)
+   * [4d5c86] Mark all LTTng tracepoints symbols as optional
+   * [b92a2f] Build depend on debhelper >= 11.5.4~
+   * [5781cc] Add Breaks/Replaces ceph-base (<< 12.2.10+dfsg1-1~) to ceph-common
+     (Closes: #919898)
+   * [658bd3] Fixup Breaks/Replaces for files moved between binary packages
+   * [c24137] Install systemd units for Ceph MGR service
+     (Closes: #920176, #919871)
+   * [091e14] Remove no longer needed dpkg-maintscript-helper calls in radosgw
+   * [567dde] Temp changelog commit
+ 
+  -- Gaudenz Steinlin <gaudenz@debian.org>  Tue, 12 Feb 2019 10:55:02 +0100
  
  ceph (12.2.10+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 909cd9334abfdcd84a81f849ba0259e897f7ba43,49eb89b9a484293c1033b816f763e2ae3857d9c7..456a777db6411810877e712002bead23dc49f203
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -14,4 -14,5 +14,6 @@@ fix-var-run-perms-sysvinit.patc
  armhf-ftbfs.patch
  boost-1.67-fixes.patch
  softfp-armel.patch
+ 32-bit-ftbfs.patch
+ radosgw-linkage-without-beast.patch
 +detect-raspbian.diff

diff --cc install-deps.sh
Simple merge